All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 00/22] Jethro-next pull request 2016-2
@ 2016-01-10  0:59 Armin Kuster
  2016-01-10  0:59 ` [PATCH 01/22] edac-utils: add patches for initscript Armin Kuster
                   ` (21 more replies)
  0 siblings, 22 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

Please consider these changes for Jethro-next

The following changes since commit 26eefaedfe82512b1db57c6fb8ca7bd1a6bc97d4:

  tcpdump: add PACKAGECONFIG for libcap-ng (2015-12-30 13:06:00 +0100)

are available in the git repository at:

  git://github.com/akuster/meta-openembedded akuster/jethro-next
  https://github.com/akuster/meta-openembedded/tree/akuster/jethro-next

Andre McCurdy (4):
  mpg123: add textrel to INSANE_SKIP
  opencv: sort PACKAGECONFIG options
  opencv: limit ARM_INSTRUCTION_SET = "arm" over-ride to armv4/armv5
  opencv: support machines based on oe-core tune-corei7.inc

Andrea Adami (1):
  kexec-tools-klibc: add explicit SRC_URI

Armin Kuster (3):
  gnome-desktop: Fix QA issue
  fltk: fix build issue.
  fltk: Fix license warning

Chris Patterson (3):
  strongswan: add additional PACKAGECONFIG flags
  strongswan: add configure patch fix for systemd
  strongswan: install strongswan-swanctl systemd service by default.

Jagadeesh Krishnanjanappa (1):
  iscsitarget: resolve build error if CONFIG_IPV6 config is not enabled

Jens Rehsack (1):
  samba: fix typo distinguishing between plain sysv init and lsb init

Jose Alarcon (3):
  contrib: ensure that oe-stylize.py works with python versions < 3.0
  contrib: add missing common OE variables
  contrib: print oldline within single quotes

Kai Kang (2):
  edac-utils: add patches for initscript
  iperf3: fix build-deps qa warning

Rafaël Carré (2):
  VLC: PACKAGECONFIG for new dependency on libvncserver
  VLC: depend on jpeg rather than libjpeg-turbo

Yi Zhao (1):
  polkit-gnome: remove unrecognized configure options

mike.looijmans@topic.nl (1):
  samba: Fix typo in PACKAGECONFIG for "acl" and "aio"

 contrib/oe-stylize.py                              |  9 +-
 .../gnome-desktop/gnome-desktop_2.32.1.bb          |  2 +-
 .../kexec/kexec-tools-klibc_2.0.2.bb               |  2 +
 .../recipes-multimedia/mpg123/mpg123_1.21.0.bb     |  4 +
 meta-multimedia/recipes-multimedia/vlc/vlc.inc     |  3 +-
 .../recipes-connectivity/samba/samba_4.1.12.bb     |  6 +-
 .../access-sk_v6_daddr-iff-IPV6-defined.patch      | 28 +++++++
 .../iscsitarget/iscsitarget_1.4.20.3+svn502.bb     |  1 +
 .../files/install-strongswan-swanctl-service.patch | 22 +++++
 .../strongswan/files/support-newer-systemd.patch   | 69 +++++++++++++++
 .../recipes-support/strongswan/strongswan_5.3.2.bb | 26 ++++--
 meta-oe/licenses/FLTK                              | 43 ++++++++++
 meta-oe/recipes-benchmark/iperf3/iperf3_git.bb     |  3 +
 .../recipes-extended/polkit/polkit-gnome_0.105.bb  |  4 -
 .../recipes-support/edac-utils/edac-utils_git.bb   | 19 +++--
 .../files/add-restart-to-initscript.patch          | 33 ++++++++
 ...cript-be-able-to-automatically-load-EDAC-.patch | 98 ++++++++++++++++++++++
 .../fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch   | 37 ++++++++
 meta-oe/recipes-support/fltk/fltk_1.1.10.bb        |  1 +
 meta-oe/recipes-support/opencv/opencv_2.4.bb       | 10 ++-
 meta-oe/recipes-support/opencv/opencv_3.0.bb       | 20 +++--
 21 files changed, 406 insertions(+), 34 deletions(-)
 create mode 100644 meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch
 create mode 100644 meta-networking/recipes-support/strongswan/files/install-strongswan-swanctl-service.patch
 create mode 100644 meta-networking/recipes-support/strongswan/files/support-newer-systemd.patch
 create mode 100644 meta-oe/licenses/FLTK
 create mode 100644 meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch
 create mode 100644 meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch

-- 
1.9.1



^ permalink raw reply	[flat|nested] 23+ messages in thread
* [PATCH 01/22] edac-utils: add patches for initscript
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 02/22] kexec-tools-klibc: add explicit SRC_URI Armin Kuster
                   ` (20 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Kai Kang <kai.kang@windriver.com>

Update LIC_FILES_CHKSUM that the whole license file should be used
rather than the first 2 lines.

Remove COMPATIBLE_HOST that edac-utils could build for all architectures.

Update runtime dependencies:

* add perl modules that edac-ctl needs
* add dmidecode for the archs which are in COMPATIBLE_HOST of dmidecode
  that dmidecode is required by command edac-ctl.

And add patches for initscripts to:

* add restart subcommand
* make init script be able to load EDAC module automatically

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-support/edac-utils/edac-utils_git.bb   | 19 +++--
 .../files/add-restart-to-initscript.patch          | 33 ++++++++
 ...cript-be-able-to-automatically-load-EDAC-.patch | 98 ++++++++++++++++++++++
 3 files changed, 145 insertions(+), 5 deletions(-)
 create mode 100644 meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch
 create mode 100644 meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch

diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
index e5621ad..9bd2f0a 100644
--- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Userspace helper for Linux kernel EDAC drivers"
 HOMEPAGE = "https://github.com/grondo/edac-utils"
 SECTION = "Applications/System"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = " sysfsutils"
 
@@ -11,7 +11,10 @@ PV = "0.16+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/grondo/edac-utils;protocol=http"
+SRC_URI = "git://github.com/grondo/edac-utils \
+    file://make-init-script-be-able-to-automatically-load-EDAC-.patch \
+    file://add-restart-to-initscript.patch \
+"
 
 inherit autotools-brokensep
 
@@ -20,6 +23,12 @@ do_configure_prepend () {
     ${S}/bootstrap
 }
 
-COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
-
-RDEPENDS_${PN} = " perl"
+RDEPENDS_${PN}_x86 = "dmidecode"
+RDEPENDS_${PN}_x86-64 = "dmidecode"
+RDEPENDS_${PN}_arm = "dmidecode"
+RDEPENDS_${PN}_aarch64 = "dmidecode"
+RDEPENDS_${PN}_powerpc = "dmidecode"
+RDEPENDS_${PN}_powerpc64 = "dmidecode"
+RDEPENDS_${PN}_append = " \
+    perl-module-file-basename perl-module-file-find perl-module-getopt-long perl-module-posix \
+"
diff --git a/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch b/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch
new file mode 100644
index 0000000..87051da
--- /dev/null
+++ b/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch
@@ -0,0 +1,33 @@
+From 3ade837f64de0cfe2aed5bc52f7919760f350531 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Fri, 7 Mar 2014 00:57:12 -0500
+Subject: [PATCH] edac: add restart to initscript
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ src/etc/edac.init.in |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in
+index adf76ee..007a519 100644
+--- a/src/etc/edac.init.in
++++ b/src/etc/edac.init.in
+@@ -155,8 +155,12 @@ case "$1" in
+   status)
+     service_status
+     ;;
++  restart)
++    service_stop
++    service_start
++    ;;
+   *)
+-    COMMANDS="start|stop|status"
++    COMMANDS="start|stop|status|restart"
+     echo "Usage: $0 {${COMMANDS}}"
+     exit 2
+     ;;
+-- 
+1.7.9.5
+
diff --git a/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch b/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch
new file mode 100644
index 0000000..fddc25f
--- /dev/null
+++ b/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch
@@ -0,0 +1,98 @@
+make init script be able to automatically load EDAC module.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Roy.Li <rongqing.li@windriver.com>
+---
+ src/etc/edac.init.in |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 47 insertions(+), 2 deletions(-)
+
+diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in
+index 7a51da9..5b568c4 100644
+--- a/src/etc/edac.init.in
++++ b/src/etc/edac.init.in
+@@ -42,7 +42,6 @@ for dir in "$sysconfdir/default" "$sysconfdir/sysconfig"; do
+   [ -f "$dir/$SERVICE" ] && . "$dir/$SERVICE"
+ done
+ 
+-
+ ###############################################################################
+ 
+ service_start ()
+@@ -52,6 +51,46 @@ service_start ()
+ # Assume that if EDAC_DRIVER is not set, then EDAC is configured
+ #  automatically, thus return successfully, but don't do anything.
+ #
++    if [ ! -f /etc/edac/edac-driver ]; then
++         [ -d /sys/bus/edac/devices/mc/mc0 ] && \
++         echo `lsmod | grep _edac | cut -d" " -f1` > /etc/edac/edac-driver
++    fi
++
++    [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver`
++
++    if [ -z "$EDAC_DRIVER" ]; then
++
++        DRIVER_PATH=/lib/modules/`uname -r`/kernel/drivers/edac
++        oldpath=`pwd`
++        if [ -d $DRIVER_PATH ]; then
++
++            cd $DRIVER_PATH
++
++            for i in $(/bin/ls | /usr/bin/cut -d. -f1) ; do
++                /sbin/modprobe $i 2>/dev/null
++                if [ -d /sys/bus/edac/devices/mc/mc0 ]; then
++                    echo $i> /etc/edac/edac-driver
++                    EDAC_DRIVER=$i
++                    break
++                fi
++                /sbin/modprobe -r $i 2>/dev/null
++            done
++
++            cd "$oldpath"
++
++
++            if [ -z "$EDAC_DRIVER" ]; then
++                echo "This board may not support EDAC, or EDAC module may not be compiled in"
++                exit
++            fi
++
++        else
++            echo "This board may not support EDAC, or EDAC module may not be compiled in"
++            exit
++        fi
++
++    fi
++
+   if [ -n "$EDAC_DRIVER" ]; then
+      echo -n "Starting ${SERVICE}: "
+      modprobe $EDAC_DRIVER
+@@ -76,12 +115,15 @@ service_start ()
+ service_stop ()
+ {
+   echo -n "Disabling ${SERVICE}: "
++
++  [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver`
++
+   if [ -n "$EDAC_DRIVER" ]; then
+     modprobe -r $EDAC_DRIVER
+     STATUS=$?
+     [ $STATUS -eq 0 ] && echo success || echo failure
+   else
+-    echo "Not supported for this configuration."
++    echo "Not supported for this configuration, or EDAC Module is not loaded."
+     STATUS=6
+   fi
+ }
+@@ -92,6 +134,9 @@ service_status ()
+ {
+ # Print the current status of the service.  Required by LSB.
+ #
++  [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver`
++  [ -z "$EDAC_DRIVER" ] && STATUS=1 && exit
++
+   edac-ctl --status
+   STATUS=0
+ }
+-- 
+1.7.10.4
+
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 02/22] kexec-tools-klibc: add explicit SRC_URI
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
  2016-01-10  0:59 ` [PATCH 01/22] edac-utils: add patches for initscript Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 03/22] VLC: PACKAGECONFIG for new dependency on libvncserver Armin Kuster
                   ` (19 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Andrea Adami <andrea.adami@gmail.com>

After commit c2492ed SRC_URI of the recipe contains the kdump script.
Kdump is not in the purposes of this recipe so we restore the plain SRC_URI.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
index d5b7bbe..c9fec25 100644
--- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
+++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
@@ -8,6 +8,8 @@ inherit klibc
 
 FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
 
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz"
+
 SRC_URI += " \
             file://kexec-elf-rel.patch \
             file://kexec-syscall.patch \
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 03/22] VLC: PACKAGECONFIG for new dependency on libvncserver
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
  2016-01-10  0:59 ` [PATCH 01/22] edac-utils: add patches for initscript Armin Kuster
  2016-01-10  0:59 ` [PATCH 02/22] kexec-tools-klibc: add explicit SRC_URI Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 04/22] VLC: depend on jpeg rather than libjpeg-turbo Armin Kuster
                   ` (18 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Rafaël Carré <funman@videolan.org>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index ce3601d..a5b214d 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -72,6 +72,7 @@ PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
 PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
 PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
 PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
+PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver"
 
 do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 04/22] VLC: depend on jpeg rather than libjpeg-turbo
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (2 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 03/22] VLC: PACKAGECONFIG for new dependency on libvncserver Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 05/22] strongswan: add additional PACKAGECONFIG flags Armin Kuster
                   ` (17 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Rafaël Carré <funman@videolan.org>

The underlying libjpeg implementation doesn't matter

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index a5b214d..46dbd5d 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -9,7 +9,7 @@ DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
    virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
    tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \
    lua-native lua libidn \
-   avahi libjpeg-turbo xz libmodplug mpeg2dec \
+   avahi jpeg xz libmodplug mpeg2dec \
    libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
    tiff xcb-util-keysyms"
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 05/22] strongswan: add additional PACKAGECONFIG flags
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (3 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 04/22] VLC: depend on jpeg rather than libjpeg-turbo Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 06/22] strongswan: add configure patch fix for systemd Armin Kuster
                   ` (16 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Chris Patterson <pattersonc@ainfosec.com>

- Add aesni, charon, gmp, openssl, scep, stroke, swanctl, and
  systemd-charon.
- Organize the packageconfig list alphabetically.
- Update the default PACKAGECONFIG to match current defaults.
- If swanctl is enabled, use strongswan-swanctl.service instead of
  strongswan.service.

Signed-off-by: Chris Patterson <pattersonc@ainfosec.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-support/strongswan/strongswan_5.3.2.bb | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
index a231a90..df7b496 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
@@ -14,21 +14,31 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c"
 SRC_URI[sha256sum] = "a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225"
 
-EXTRA_OECONF = "--enable-gmp \
-        --enable-openssl \
+EXTRA_OECONF = " \
         --without-lib-prefix \
 "
 
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
-PACKAGECONFIG ??= "sqlite3 curl \
+
+PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \
         ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \
 "
-PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,"
-PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,"
+PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,"
+PACKAGECONFIG[charon] = "--enable-charon,--disable-charon,"
 PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,"
-PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,"
+PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,"
+PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,"
 PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
+PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,"
+PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient,"
+PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,"
+PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,"
+PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,"
+PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc"
+
+# requires swanctl
+PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd,"
 
 inherit autotools systemd pkgconfig
 
@@ -42,4 +52,4 @@ FILES_${PN}-staticdev += "${libdir}/ipsec/*.a ${libdir}/ipsec/plugins/*.a"
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${BPN}.service"
+SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}-swanctl.service', '${BPN}.service', d)}"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 06/22] strongswan: add configure patch fix for systemd
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (4 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 05/22] strongswan: add additional PACKAGECONFIG flags Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 07/22] strongswan: install strongswan-swanctl systemd service by default Armin Kuster
                   ` (15 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Chris Patterson <pattersonc@ainfosec.com>

Fixes strongswan configure script for systemd >= 209,
where it merged libsystemd-journal and libsystemd-daemon
into libsystemd.

Signed-off-by: Chris Patterson <pattersonc@ainfosec.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../strongswan/files/support-newer-systemd.patch   | 69 ++++++++++++++++++++++
 .../recipes-support/strongswan/strongswan_5.3.2.bb |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 meta-networking/recipes-support/strongswan/files/support-newer-systemd.patch

diff --git a/meta-networking/recipes-support/strongswan/files/support-newer-systemd.patch b/meta-networking/recipes-support/strongswan/files/support-newer-systemd.patch
new file mode 100644
index 0000000..550cf67
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/files/support-newer-systemd.patch
@@ -0,0 +1,69 @@
+commit 82498129e0a91dfc3ed2c4ec3b2252f44655b83c
+Author: Chris Patterson <pattersonc@ainfosec.com>
+Date:   Fri Dec 18 08:27:57 2015 -0500
+
+    configure: support systemd >= 209
+    
+    libsystemd-journal and libsystemd-daemon are now just
+    part of libsystemd.
+    
+    Keep original systemd checks as a fallback.
+    
+    Updates charon-systemd/Makefile.am accordingly.
+    
+    Tested on:
+    - debian wheezy (systemd v44)
+    - ubuntu 15.10 (systemd v255).
+    
+    Signed-off-by: Chris Patterson <pattersonc@ainfosec.com>
+
+Upstream-Status: Submitted
+https://github.com/strongswan/strongswan/pull/24
+
+diff --git a/configure.ac b/configure.ac
+index 3d71ce0..f6c0426 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -941,13 +941,17 @@ if test x$systemd = xtrue; then
+ 		AC_MSG_ERROR([not found (try --with-systemdsystemunitdir)])
+ 	fi
+ 
+-	PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon])
+-	AC_SUBST(systemd_daemon_CFLAGS)
+-	AC_SUBST(systemd_daemon_LIBS)
+-
+-	PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal])
+-	AC_SUBST(systemd_journal_CFLAGS)
+-	AC_SUBST(systemd_journal_LIBS)
++	PKG_CHECK_MODULES(systemd, [libsystemd >= 209],
++		[AC_SUBST(systemd_CFLAGS)
++		AC_SUBST(systemd_LIBS)],
++		[PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon])
++		AC_SUBST(systemd_daemon_CFLAGS)
++		AC_SUBST(systemd_daemon_LIBS)
++
++		PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal])
++		AC_SUBST(systemd_journal_CFLAGS)
++		AC_SUBST(systemd_journal_LIBS)
++		])
+ fi
+ 
+ if test x$tss = xtrousers; then
+diff --git a/src/charon-systemd/Makefile.am b/src/charon-systemd/Makefile.am
+index 1b9ac15..ee85d43 100644
+--- a/src/charon-systemd/Makefile.am
++++ b/src/charon-systemd/Makefile.am
+@@ -9,11 +9,11 @@ charon_systemd_CPPFLAGS = \
+ 	-I$(top_srcdir)/src/libstrongswan \
+ 	-I$(top_srcdir)/src/libhydra \
+ 	-I$(top_srcdir)/src/libcharon \
+-	$(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \
++	$(systemd_CFLAGS) $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \
+ 	-DPLUGINS=\""${charon_plugins}\""
+ 
+ charon_systemd_LDADD = \
+ 	$(top_builddir)/src/libstrongswan/libstrongswan.la \
+ 	$(top_builddir)/src/libhydra/libhydra.la \
+ 	$(top_builddir)/src/libcharon/libcharon.la \
+-	$(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB)
++	$(systemd_LIBS) $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB)
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
index df7b496..aa32383 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
@@ -9,6 +9,7 @@ DEPENDS = "gmp openssl flex-native flex bison-native"
 
 SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
         file://fix-funtion-parameter.patch \
+        file://support-newer-systemd.patch \
 "
 
 SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 07/22] strongswan: install strongswan-swanctl systemd service by default.
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (5 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 06/22] strongswan: add configure patch fix for systemd Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 08/22] mpg123: add textrel to INSANE_SKIP Armin Kuster
                   ` (14 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Chris Patterson <pattersonc@ainfosec.com>

Matches start-on-boot behaviour of current strongswan.service.

Signed-off-by: Chris Patterson <pattersonc@ainfosec.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../files/install-strongswan-swanctl-service.patch | 22 ++++++++++++++++++++++
 .../recipes-support/strongswan/strongswan_5.3.2.bb |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 meta-networking/recipes-support/strongswan/files/install-strongswan-swanctl-service.patch

diff --git a/meta-networking/recipes-support/strongswan/files/install-strongswan-swanctl-service.patch b/meta-networking/recipes-support/strongswan/files/install-strongswan-swanctl-service.patch
new file mode 100644
index 0000000..86baccf
--- /dev/null
+++ b/meta-networking/recipes-support/strongswan/files/install-strongswan-swanctl-service.patch
@@ -0,0 +1,22 @@
+commit 44cbabd8a42bc2a436562ed33fb8c89fa6b75b6e
+Author: Chris Patterson <pattersonc@ainfosec.com>
+Date:   Fri Dec 18 08:31:48 2015 -0500
+
+    strongswan-swanctl.service.in: match install used by strongswan.service
+    
+    Signed-off-by: Chris Patterson <pattersonc@ainfosec.com>
+
+Upstream-Status: Submitted
+https://github.com/strongswan/strongswan/pull/25
+
+diff --git a/init/systemd-swanctl/strongswan-swanctl.service.in b/init/systemd-swanctl/strongswan-swanctl.service.in
+index 818d352..944101f 100644
+--- a/init/systemd-swanctl/strongswan-swanctl.service.in
++++ b/init/systemd-swanctl/strongswan-swanctl.service.in
+@@ -7,3 +7,6 @@ Type=notify
+ ExecStart=@SBINDIR@/charon-systemd
+ ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt
+ ExecReload=@SBINDIR@/swanctl --reload
++
++[Install]
++WantedBy=multi-user.target
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
index aa32383..7ec1a8e 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb
@@ -10,6 +10,7 @@ DEPENDS = "gmp openssl flex-native flex bison-native"
 SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
         file://fix-funtion-parameter.patch \
         file://support-newer-systemd.patch \
+        file://install-strongswan-swanctl-service.patch \
 "
 
 SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 08/22] mpg123: add textrel to INSANE_SKIP
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (6 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 07/22] strongswan: install strongswan-swanctl systemd service by default Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 09/22] opencv: sort PACKAGECONFIG options Armin Kuster
                   ` (13 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Andre McCurdy <armccurdy@gmail.com>

The x86 assembler optimisations contains text relocations and there
are no upstream plans to fix them:

  http://sourceforge.net/p/mpg123/bugs/168/

Benchmarking suggests that the SSE assembler is still clearly faster
than the generic C code, so leave the assembler optimisations enabled.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-multimedia/recipes-multimedia/mpg123/mpg123_1.21.0.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.21.0.bb b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.21.0.bb
index 3aa5f3d..85bd347 100644
--- a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.21.0.bb
+++ b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.21.0.bb
@@ -49,6 +49,10 @@ EXTRA_OECONF = " \
     ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \
 "
 
+# The x86 assembler optimisations contains text relocations and there are no
+# upstream plans to fix them: http://sourceforge.net/p/mpg123/bugs/168/
+INSANE_SKIP_${PN}_append_x86 = " textrel"
+
 # Fails to build with thumb-1 (qemuarm)
 #| {standard input}: Assembler messages:
 #| {standard input}:47: Error: selected processor does not support Thumb mode `smull r5,r6,r7,r4'
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 09/22] opencv: sort PACKAGECONFIG options
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (7 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 08/22] mpg123: add textrel to INSANE_SKIP Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 10/22] opencv: limit ARM_INSTRUCTION_SET = "arm" over-ride to armv4/armv5 Armin Kuster
                   ` (12 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Andre McCurdy <armccurdy@gmail.com>

Recipe cleanup only, no functional changes.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_2.4.bb |  5 +++--
 meta-oe/recipes-support/opencv/opencv_3.0.bb | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 3b10b55..14d025c 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -34,15 +34,16 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
 PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l \
                    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
                    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
+
 PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,"
 PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+,"
+PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
 PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
+PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
 PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
 PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
 PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
-PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
-PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
 
 inherit distutils-base pkgconfig cmake
 
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
index 575709c..dee4436 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -33,22 +33,23 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
 PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \
                    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
 		   ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
+
+PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
+PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
 PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,"
+PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
 PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,"
+PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
 PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
-PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
-PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
-PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
 PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
-PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,"
-PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
-PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
 PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,"
-PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base,"
 PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
+PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
 PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
 PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
+PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
+PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
 
 inherit distutils-base pkgconfig cmake
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 10/22] opencv: limit ARM_INSTRUCTION_SET = "arm" over-ride to armv4/armv5
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (8 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 09/22] opencv: sort PACKAGECONFIG options Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 11/22] opencv: support machines based on oe-core tune-corei7.inc Armin Kuster
                   ` (11 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Andre McCurdy <armccurdy@gmail.com>

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_2.4.bb | 3 ++-
 meta-oe/recipes-support/opencv/opencv_3.0.bb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 14d025c..508655e 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -5,7 +5,8 @@ SECTION = "libs"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14"
 
-ARM_INSTRUCTION_SET = "arm"
+ARM_INSTRUCTION_SET_armv4 = "arm"
+ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
 
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
index dee4436..8ffe1cf 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -5,7 +5,8 @@ SECTION = "libs"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf"
 
-ARM_INSTRUCTION_SET = "arm"
+ARM_INSTRUCTION_SET_armv4 = "arm"
+ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEFAULT_PREFERENCE = "-1"
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 11/22] opencv: support machines based on oe-core tune-corei7.inc
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (9 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 10/22] opencv: limit ARM_INSTRUCTION_SET = "arm" over-ride to armv4/armv5 Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 12/22] iperf3: fix build-deps qa warning Armin Kuster
                   ` (10 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Andre McCurdy <armccurdy@gmail.com>

oe-core tune-corei7.inc enables -msse4.2 (rather than -msse3, which is
only enabled by tune-core2.inc). Add test for -msse4.2 to ensure that
SSE is enabled for machines based on tune-corei7.inc (also add a test
for -msse4.1 for completeness).

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/opencv/opencv_2.4.bb | 2 ++
 meta-oe/recipes-support/opencv/opencv_3.0.bb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 508655e..a74853c 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -28,6 +28,8 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
                  -DWITH_1394=OFF \
                  -DCMAKE_SKIP_RPATH=ON \
                  ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
+                 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
+                 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb
index 8ffe1cf..1948a16 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -27,6 +27,8 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI
                  -DWITH_1394=OFF \
                  -DCMAKE_SKIP_RPATH=ON \
                  ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
+                 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
+                 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
                  ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
 "
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 12/22] iperf3: fix build-deps qa warning
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (10 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 11/22] opencv: support machines based on oe-core tune-corei7.inc Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 13/22] samba: Fix typo in PACKAGECONFIG for "acl" and "aio" Armin Kuster
                   ` (9 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Kai Kang <kai.kang@windriver.com>

Add PACKAGECONFIG lksctp to fix qa warning:

| WARNING: QA Issue: iperf3 rdepends on lksctp-tools, but it isn't a
| build dependency? [build-deps]

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-benchmark/iperf3/iperf3_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb
index 58818bb..4a0f28e 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb
@@ -22,4 +22,7 @@ SRCREV = "e396134952a01199326665d1df7c51ae9e62e945"
 S = "${WORKDIR}/git"
 
 inherit autotools
+
+PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sctp_h=no,lksctp-tools"
+
 BBCLASSEXTEND = "native"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 13/22] samba: Fix typo in PACKAGECONFIG for "acl" and "aio"
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (11 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 12/22] iperf3: fix build-deps qa warning Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 14/22] contrib: ensure that oe-stylize.py works with python versions < 3.0 Armin Kuster
                   ` (8 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: "mike.looijmans@topic.nl" <mike.looijmans@topic.nl>

There's a "-" too many in PACKAGECONFIG[acl] and PACKAGECONFIG[aio]
resulting in errors like this if built without acl:
  waf: error: no such option: ---without-acl-support

Remove the extra "-" to fix the issue.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
index cb29ab9..5eab07e 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
@@ -55,8 +55,8 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
 
 RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}"
 
-PACKAGECONFIG[acl] = "--with-acl-support,---without-acl-support,acl"
-PACKAGECONFIG[aio] = "--with-aio-support,---without-aio-support,libaio"
+PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl"
+PACKAGECONFIG[aio] = "--with-aio-support,--without-aio-support,libaio"
 PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin"
 PACKAGECONFIG[pam] = "--with-pam --with-pam_smbpass --with-pammodulesdir=${base_libdir}/security,--without-pam --without-pam_smbpass,libpam"
 PACKAGECONFIG[lsb] = ",,lsb"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 14/22] contrib: ensure that oe-stylize.py works with python versions < 3.0
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (12 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 13/22] samba: Fix typo in PACKAGECONFIG for "acl" and "aio" Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 15/22] contrib: add missing common OE variables Armin Kuster
                   ` (7 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Jose Alarcon <jose.alarcon@ge.com>

Signed-off-by: Jose Alarcon <jose.alarcon@ge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 contrib/oe-stylize.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py
index 712557d..a2fcde1 100755
--- a/contrib/oe-stylize.py
+++ b/contrib/oe-stylize.py
@@ -19,6 +19,7 @@ TODO:
  - count rule breaks and displays them in the order frequence
 """
 
+from __future__ import print_function 
 import fileinput
 import string
 import re
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 15/22] contrib: add missing common OE variables
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (13 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 14/22] contrib: ensure that oe-stylize.py works with python versions < 3.0 Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 16/22] contrib: print oldline within single quotes Armin Kuster
                   ` (6 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Jose Alarcon <jose.alarcon@ge.com>

Signed-off-by: Jose Alarcon <jose.alarcon@ge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 contrib/oe-stylize.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py
index a2fcde1..7bb310d 100755
--- a/contrib/oe-stylize.py
+++ b/contrib/oe-stylize.py
@@ -121,6 +121,7 @@ OE_vars = [
     'CONFFILES',
     'CONFLICTS',
     'CORE_EXTRA_D',
+    'CORE_IMAGE_EXTRA_INSTALL',
     'CORE_PACKAGES_D',
     'CORE_PACKAGES_RD',
     'CPPFLAGS',
@@ -141,6 +142,7 @@ OE_vars = [
     'INITSCRIPT_PACKAGES',
     'INITSCRIPT_NAME',
     'INITSCRIPT_PARAMS',
+    'INSANE_SKIP',
     'PACKAGE_INSTALL',
     'KERNEL_IMAGETYPE',
     'KERNEL_IMAGEDEST',
@@ -199,6 +201,8 @@ OE_vars = [
     'UBOOT_MACHINE',
     'UCLIBC_BASE',
     'UCLIBC_PATCHES',
+    'USERADD_PACKAGES',
+    'USERADD_PARAM',
     'VIRTUAL_NAME',
     'XORG_PN',
     'XSERVER',
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 16/22] contrib: print oldline within single quotes
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (14 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 15/22] contrib: add missing common OE variables Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 17/22] iscsitarget: resolve build error if CONFIG_IPV6 config is not enabled Armin Kuster
                   ` (5 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Jose Alarcon <jose.alarcon@ge.com>

Signed-off-by: Jose Alarcon <jose.alarcon@ge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 contrib/oe-stylize.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py
index 7bb310d..db8a363 100755
--- a/contrib/oe-stylize.py
+++ b/contrib/oe-stylize.py
@@ -311,10 +311,10 @@ def follow_rule(i, line):
         # if the line still does not respect the rule
         if not rules[i][0](line):
             # this is a rule disgression
-            print ("## Disgression: ", rules[i][2], " in:", oldline)
+            print ("## Disgression: ", rules[i][2], " in: '", oldline, "'")
         else:
             # just remind user about his/her errors
-            print ("## Reminder: ", rules[i][2], " in :", oldline)
+            print ("## Reminder: ", rules[i][2], " in : '", oldline, "'")
     return line
 
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 17/22] iscsitarget: resolve build error if CONFIG_IPV6 config is not enabled
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (15 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 16/22] contrib: print oldline within single quotes Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 18/22] polkit-gnome: remove unrecognized configure options Armin Kuster
                   ` (4 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>

The element skc_v6_daddr (in struct sock_common) is defined in
kernel source only when CONFIG_IPV6 is enabled. Hence, access
sk_v6_daddr element (i.e __sk_common.skc_v6_daddr) only when CONFIG_IPV6
is defined; to fix below error in world build:

-- snip --
/home/jenkins/oe/world/shr-core/tmp-glibc/work-shared/qemux86/kernel-source/include/net/sock.h:330:33: error: 'struct sock_common' has no member named 'skc_v6_daddr'
-- CUT --

Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../access-sk_v6_daddr-iff-IPV6-defined.patch      | 28 ++++++++++++++++++++++
 .../iscsitarget/iscsitarget_1.4.20.3+svn502.bb     |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch

diff --git a/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch b/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch
new file mode 100644
index 0000000..4444234
--- /dev/null
+++ b/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch
@@ -0,0 +1,28 @@
+The element skc_v6_daddr (in struct sock_common) is defined in 
+kernel source only when CONFIG_IPV6 is enabled. Hence, access 
+sk_v6_daddr element (i.e __sk_common.skc_v6_daddr) only when CONFIG_IPV6 
+is defined; to fix below error in world build:
+
+-- snip --
+/home/jenkins/oe/world/shr-core/tmp-glibc/work-shared/qemux86/kernel-source/include/net/sock.h:330:33: error: 'struct sock_common' has no member named 'skc_v6_daddr'
+-- CUT --
+
+Upstream-Status: Pending
+
+Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
+
+--- iscsitarget-1.4.20.3+svn502_org/kernel/conn.c	2015-12-29 21:57:50.547932217 -0800
++++ iscsitarget-1.4.20.3+svn502/kernel/conn.c	2015-12-29 22:47:25.254657627 -0800
+@@ -46,10 +46,12 @@ void conn_info_show(struct seq_file *seq
+ 			snprintf(buf, sizeof(buf),
+ 				 "%pI4", &inet_sk(sk)->inet_daddr);
+ 			break;
++#if defined(CONFIG_IPV6)
+ 		case AF_INET6:
+ 			snprintf(buf, sizeof(buf), "[%pI6]",
+ 				 &(sk)->sk_v6_daddr);
+ 			break;
++#endif /* defined(CONFIG_IPV6) */
+ 		default:
+ 			break;
+ 		}
diff --git a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
index c96810b..b327f86 100644
--- a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
+++ b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
@@ -11,6 +11,7 @@ DEPENDS = "openssl virtual/kernel"
 SRC_URI = "http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${PV}.orig.tar.gz \
            file://use-kernel-makefile-to-get-kernel-version.patch \
            file://fix-errors-observed-with-linux-3.19-and-greater.patch \
+           file://access-sk_v6_daddr-iff-IPV6-defined.patch \
 	  "
 SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089"
 SRC_URI[sha256sum] = "d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 18/22] polkit-gnome: remove unrecognized configure options
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (16 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 17/22] iscsitarget: resolve build error if CONFIG_IPV6 config is not enabled Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 19/22] samba: fix typo distinguishing between plain sysv init and lsb init Armin Kuster
                   ` (3 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Yi Zhao <yi.zhao@windriver.com>

Fix QA warning:
WARNING: QA Issue: polkit-gnome: configure was passed unrecognised options:
--disable-examples --disable-introspection [unknown-configure-option]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
index be33908..8e99731 100644
--- a/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
@@ -13,11 +13,7 @@ SRC_URI = "https://download.gnome.org/sources/polkit-gnome/${PV}/polkit-gnome-${
 SRC_URI[md5sum] = "50ecad37c8342fb4a52f590db7530621"
 SRC_URI[sha256sum] = "1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369"
 
-#PNBLACKLIST[polkit-gnome] ?= "Fails to build, m4:configure.ac:125: recursion limit of 1024 exceeded, use -L<N> to change it"
-
 EXTRA_OECONF = "\
-    --disable-examples \
-    --disable-introspection \
     --disable-static \
 "
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 19/22] samba: fix typo distinguishing between plain sysv init and lsb init
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (17 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 18/22] polkit-gnome: remove unrecognized configure options Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 20/22] gnome-desktop: Fix QA issue Armin Kuster
                   ` (2 subsequent siblings)
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

From: Jens Rehsack <rehsack@gmail.com>

During fix for distinguishing between lsb flavoured sysv init and pure, on the
rocks version, author introduced a typo.

Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
index 5eab07e..fbdbd5a 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
@@ -117,7 +117,7 @@ do_install_append() {
 	install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d
 	update-rc.d -r ${D} samba.sh start 20 3 5 .
 	update-rc.d -r ${D} samba.sh start 20 0 1 6 .
-    elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
+    elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh
 	update-rc.d -r ${D} samba.sh start 20 3 5 .
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 20/22] gnome-desktop: Fix QA issue
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (18 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 19/22] samba: fix typo distinguishing between plain sysv init and lsb init Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 21/22] fltk: fix build issue Armin Kuster
  2016-01-10  0:59 ` [PATCH 22/22] fltk: Fix license warning Armin Kuster
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

WARNING: QA Issue: /usr/bin/gnome-about_gnome-desktop contained in package gnome-desktop requires /usr/bin/python, but no providers found in its RDEPENDS [file-rdeps]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
index 6256396..1dff745 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
@@ -27,4 +27,4 @@ FILES_${PN} += "${datadir}/gnome-about"
 
 # for gnome-about
 RRECOMMENDS_${PN} += "python-pygtk python-pycairo"
-
+RDEPENDS_${PN} += "python"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 21/22] fltk: fix build issue.
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (19 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 20/22] gnome-desktop: Fix QA issue Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  2016-01-10  0:59 ` [PATCH 22/22] fltk: Fix license warning Armin Kuster
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

this patch fixes:
Fl_JPEG_Image.cxx: In constructor 'Fl_JPEG_Image::Fl_JPEG_Image(const char*)':
| Fl_JPEG_Image.cxx:156:29: error: invalid conversion from 'int' to 'boolean' [-fpermissive]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch   | 37 ++++++++++++++++++++++
 meta-oe/recipes-support/fltk/fltk_1.1.10.bb        |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch

diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch
new file mode 100644
index 0000000..ea80011
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch
@@ -0,0 +1,37 @@
+fltk: Fl_JPEG_Image.cxx bug in fltk-1.3.x for jpeg-9
+
+Link: http://www.fltk.org/str.php?L2920
+Version: 1.3-current
+
+There has been a change in jpeg-9:
+
+Fl_JPEG_Image.cxx: In constructor 'Fl_JPEG_Image::Fl_JPEG_Image(const
+char*)':
+Fl_JPEG_Image.cxx:158:29: error: invalid conversion from 'int' to
+'boolean' [-fpermissive]
+In file included from Fl_JPEG_Image.cxx:50:0:
+/usr/include/jpeglib.h:1032:13: error:   initializing argument 2 of 'int
+jpeg_read_header(j_decompress_ptr, boolean)' [-fpermissive]
+
+
+http://permalink.gmane.org/gmane.comp.lib.fltk.bugs/10893
+
+Upstream-Status: Backport
+
+partical back port as this version is only affected by on change.
+
+Signed-off-by: Armin Kuster <akuster808@gmail.com>
+
+Index: fltk-1.1.10/src/Fl_JPEG_Image.cxx
+===================================================================
+--- fltk-1.1.10.orig/src/Fl_JPEG_Image.cxx
++++ fltk-1.1.10/src/Fl_JPEG_Image.cxx
+@@ -153,7 +153,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char
+ 
+   jpeg_create_decompress(&dinfo);
+   jpeg_stdio_src(&dinfo, fp);
+-  jpeg_read_header(&dinfo, 1);
++  jpeg_read_header(&dinfo, TRUE);
+ 
+   dinfo.quantize_colors      = (boolean)FALSE;
+   dinfo.out_color_space      = JCS_RGB;
diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
index 1404961..22a1a50 100644
--- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
+++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
@@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fl
            file://dso-fix.patch \
            file://libpng15.patch \
            file://fltk-no-freetype-config.patch \
+	   file://Fl_JPEG_Image_buildix.patch \
 "
 
 S = "${WORKDIR}/fltk-${PV}"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
* [PATCH 22/22] fltk: Fix license warning
  2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
                   ` (20 preceding siblings ...)
  2016-01-10  0:59 ` [PATCH 21/22] fltk: fix build issue Armin Kuster
@ 2016-01-10  0:59 ` Armin Kuster
  21 siblings, 0 replies; 23+ messages in thread
From: Armin Kuster @ 2016-01-10  0:59 UTC (permalink / raw)
  To: openembedded-devel

WARNING: fltk: No generic license file exists for: FLTK in any provider

Add license

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/licenses/FLTK | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 meta-oe/licenses/FLTK

diff --git a/meta-oe/licenses/FLTK b/meta-oe/licenses/FLTK
new file mode 100644
index 0000000..27a32a2
--- /dev/null
+++ b/meta-oe/licenses/FLTK
@@ -0,0 +1,43 @@
+                             FLTK License
+                           December 11, 2001
+
+The FLTK library and included programs are provided under the terms
+of the GNU Library General Public License (LGPL) with the following
+exceptions:
+
+    1. Modifications to the FLTK configure script, config
+       header file, and makefiles by themselves to support
+       a specific platform do not constitute a modified or
+       derivative work.
+
+       The authors do request that such modifications be
+       contributed to the FLTK project - send all
+       contributions to "fltk-bugs@fltk.org".
+
+    2. Widgets that are subclassed from FLTK widgets do not
+       constitute a derivative work.
+
+    3. Static linking of applications and widgets to the
+       FLTK library does not constitute a derivative work
+       and does not require the author to provide source
+       code for the application or widget, use the shared
+       FLTK libraries, or link their applications or
+       widgets against a user-supplied version of FLTK.
+
+       If you link the application or widget to a modified
+       version of FLTK, then the changes to FLTK must be
+       provided under the terms of the LGPL in sections
+       1, 2, and 4.
+
+    4. You do not have to provide a copy of the FLTK license
+       with programs that are linked to the FLTK library, nor
+       do you have to identify the FLTK license in your
+       program or documentation as required by section 6
+       of the LGPL.
+
+       However, programs must still identify their use of FLTK.
+       The following example statement can be included in user
+       documentation to satisfy this requirement:
+
+           [program/widget] is based in part on the work of
+           the FLTK project (http://www.fltk.org).
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 23+ messages in thread
end of thread, other threads:[~2016-01-10  1:09 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-10  0:59 [PATCH 00/22] Jethro-next pull request 2016-2 Armin Kuster
2016-01-10  0:59 ` [PATCH 01/22] edac-utils: add patches for initscript Armin Kuster
2016-01-10  0:59 ` [PATCH 02/22] kexec-tools-klibc: add explicit SRC_URI Armin Kuster
2016-01-10  0:59 ` [PATCH 03/22] VLC: PACKAGECONFIG for new dependency on libvncserver Armin Kuster
2016-01-10  0:59 ` [PATCH 04/22] VLC: depend on jpeg rather than libjpeg-turbo Armin Kuster
2016-01-10  0:59 ` [PATCH 05/22] strongswan: add additional PACKAGECONFIG flags Armin Kuster
2016-01-10  0:59 ` [PATCH 06/22] strongswan: add configure patch fix for systemd Armin Kuster
2016-01-10  0:59 ` [PATCH 07/22] strongswan: install strongswan-swanctl systemd service by default Armin Kuster
2016-01-10  0:59 ` [PATCH 08/22] mpg123: add textrel to INSANE_SKIP Armin Kuster
2016-01-10  0:59 ` [PATCH 09/22] opencv: sort PACKAGECONFIG options Armin Kuster
2016-01-10  0:59 ` [PATCH 10/22] opencv: limit ARM_INSTRUCTION_SET = "arm" over-ride to armv4/armv5 Armin Kuster
2016-01-10  0:59 ` [PATCH 11/22] opencv: support machines based on oe-core tune-corei7.inc Armin Kuster
2016-01-10  0:59 ` [PATCH 12/22] iperf3: fix build-deps qa warning Armin Kuster
2016-01-10  0:59 ` [PATCH 13/22] samba: Fix typo in PACKAGECONFIG for "acl" and "aio" Armin Kuster
2016-01-10  0:59 ` [PATCH 14/22] contrib: ensure that oe-stylize.py works with python versions < 3.0 Armin Kuster
2016-01-10  0:59 ` [PATCH 15/22] contrib: add missing common OE variables Armin Kuster
2016-01-10  0:59 ` [PATCH 16/22] contrib: print oldline within single quotes Armin Kuster
2016-01-10  0:59 ` [PATCH 17/22] iscsitarget: resolve build error if CONFIG_IPV6 config is not enabled Armin Kuster
2016-01-10  0:59 ` [PATCH 18/22] polkit-gnome: remove unrecognized configure options Armin Kuster
2016-01-10  0:59 ` [PATCH 19/22] samba: fix typo distinguishing between plain sysv init and lsb init Armin Kuster
2016-01-10  0:59 ` [PATCH 20/22] gnome-desktop: Fix QA issue Armin Kuster
2016-01-10  0:59 ` [PATCH 21/22] fltk: fix build issue Armin Kuster
2016-01-10  0:59 ` [PATCH 22/22] fltk: Fix license warning Armin Kuster

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.