[PATCH][v2 00/18] update + usabilty/build enhancements

[PATCH][v2 00/18] update + usabilty/build enhancements

[Andreas Müller]

v1->v2:
0008: bootstrap.bbclass -> autotools-bootstrap.bbclass as Khem suggested
0013: no copying-from-sysroot-dance - as Khem suggested (complained by me :)
0015: add bzip2 - detected in Martin's world
0016-0018: new

Note: I know samba is in very ugly condition (yes it builds but we have further
open build-deps and somebody did not understand that samba builds components for
clients connecting to servers and server itself -> packaging needs to get back
where it was) but this will be done in follow up patches (more or less promised).

The following changes since commit c63423e305c0c68e2a9aa1ae2e7509352a85c871:

  rrdtool: fix compile error (2015-11-02 15:01:10 +0100)

are available in the git repository at:

  git://github.com/schnitzeltony/meta-openembedded.git:patches 

for you to fetch changes up to dfc5ef0e94c19a109bac5a1bef9e890e402612f0:

  samba: install pam libraries to base_libdir (2015-11-05 00:35:37 +0100)

----------------------------------------------------------------
Andreas Müller (18):
      xfce4-vala: unbreak by telling configure vala API version
      xfce-polkit: initial add 0.2
      packagegroup-xfce-extended: xfce-polkit
      gparted: update to 0.24.0
      gparted: add gtk-icon-cache to inherit
      gparted: add polkit support
      gnulib: move meta-networking -> meta-oe
      autotools-bootstrap.bbclass: initial add
      netcf: use autotools-bootstrap.bbclass
      gnulib: add native extend
      fontforge: use autotools-bootstrap.bbclass
      uthash: add native extend
      fontforge: avoid cloning uthash during do_compile
      xfce4-whiskermenu-plugin: update to 1.5.1
      cdrkit: initial add 1.1.11
      luajit: drop a note for build machine requirements
      samba: add cups to DEPENDS
      samba: install pam libraries to base_libdir

 meta-gnome/recipes-extended/gparted/files/gparted_polkit                                                           | 10 ++++++++++
 meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy                               | 20 ++++++++++++++++++++
 meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb                                                              | 18 ------------------
 meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb                                                              | 38 ++++++++++++++++++++++++++++++++++++++
 meta-networking/recipes-support/netcf/netcf_git.bb                                                                 |  8 +-------
 meta-oe/classes/autotools-bootstrap.bbclass                                                                        | 24 ++++++++++++++++++++++++
 meta-oe/recipes-connectivity/samba/samba_4.1.12.bb                                                                 | 12 ++++++------
 meta-oe/recipes-devtools/luajit/luajit_2.1.bb                                                                      | 10 ++++++++++
 meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb                                                           | 13 +++++++------
 meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb                                                                 | 18 ++++++++++++++++++
 meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch            | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 {meta-networking/recipes-support/netcf => meta-oe/recipes-support/gnulib}/gnulib_git.bb                            |  2 ++
 meta-oe/recipes-support/uthash/uthash_1.9.7.bb                                                                     |  2 ++
 meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb                                                              | 11 +++++++++++
 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb                                                               |  4 ++--
 meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_git.bb => xfce4-whiskermenu-plugin_1.5.1.bb} | 10 +++-------
 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb                                                 |  2 ++
 17 files changed, 209 insertions(+), 46 deletions(-)
 create mode 100644 meta-gnome/recipes-extended/gparted/files/gparted_polkit
 create mode 100644 meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy
 delete mode 100644 meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb
 create mode 100644 meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
 create mode 100644 meta-oe/classes/autotools-bootstrap.bbclass
 create mode 100644 meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
 create mode 100644 meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
 rename {meta-networking/recipes-support/netcf => meta-oe/recipes-support/gnulib}/gnulib_git.bb (97%)
 create mode 100644 meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_git.bb => xfce4-whiskermenu-plugin_1.5.1.bb} (54%)

-- 
2.1.0

[PATCH][v2 01/18] xfce4-vala: unbreak by telling configure vala API version

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
index 7bcffe5..c1900e9 100644
--- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
+++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
@@ -5,12 +5,12 @@ DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-
 
 inherit xfce
 
-PNBLACKLIST[xfce4-vala] ?= "Fails to build since vala upgrade to 0.26.1"
-
 SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71"
 SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b"
 
+EXTRA_OECONF = "-with-vala-api=0.28"
+
 FILES_${PN} += "${datadir}/vala-*/vapi"
 
 RDEPENDS_${PN} = "vala"
-- 
2.1.0

[PATCH][v2 02/18] xfce-polkit: initial add 0.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb

diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
new file mode 100644
index 0000000..ab720f8
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
@@ -0,0 +1,11 @@
+SUMMARY = "A simple PolicyKit authentication agent for XFCE"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=758b03f872a88c99fc36d50c5932091c"
+
+DEPENDS = "libxfce4ui polkit"
+
+inherit xfce-app
+
+SRC_URI = "git://github.com/ncopa/${BPN}.git"
+SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283"
+S = "${WORKDIR}/git"
-- 
2.1.0

[PATCH][v2 03/18] packagegroup-xfce-extended: xfce-polkit

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 04934eb..ccd6f45 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -50,6 +50,8 @@ RRECOMMENDS_${PN} = " \
     xfce4-hotcorner-plugin \
     ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'xfce4-pulseaudio-plugin', '', d)} \
     \
+    xfce-polkit \
+    \
     thunar-media-tags-plugin \
     thunar-archive-plugin \
     \
-- 
2.1.0

[PATCH][v2 04/18] gparted: update to 0.24.0

[Andreas Müller]

Depending on gnome-doc-utils-native fixes (detected when building from scratch):

| gnome-doc-utils.make:63: error: HAVE_GNOME_DOC_UTILS does not appear in AM_CONDITIONAL
| help/Makefile.am:1:   'gnome-doc-utils.make' included from here
| gnome-doc-utils.make:133: error: ENABLE_SK does not appear in AM_CONDITIONAL
| help/Makefile.am:1:   'gnome-doc-utils.make' included from here
| gnome-doc-utils.make:182: error: ENABLE_SK does not appear in AM_CONDITIONAL
| help/Makefile.am:1:   'gnome-doc-utils.make' included from here
| ...
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../gparted/{gparted_0.23.0.bb => gparted_0.24.0.bb}                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-extended/gparted/{gparted_0.23.0.bb => gparted_0.24.0.bb} (70%)

diff --git a/meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
similarity index 70%
rename from meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb
rename to meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
index 0705439..d77d1ed 100644
--- a/meta-gnome/recipes-extended/gparted/gparted_0.23.0.bb
+++ b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 inherit autotools pkgconfig
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "5901dca33ced32213cccb13a2713dea8"
-SRC_URI[sha256sum] = "7fd1dddf29814c2982f55ab765b8918561e1b5dabf792012c66b4d3ba25da754"
+SRC_URI[md5sum] = "b8480274c68876acff5965d4346710e7"
+SRC_URI[sha256sum] = "02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60"
 
-DEPENDS = "glib-2.0 gtkmm parted"
+DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils-native"
 
 EXTRA_OECONF = "--disable-scrollkeeper --disable-doc"
 
-- 
2.1.0

[PATCH][v2 05/18] gparted: add gtk-icon-cache to inherit

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
index d77d1ed..0fe95a0 100644
--- a/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
+++ b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://gparted.org/index.php"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-icon-cache
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "b8480274c68876acff5965d4346710e7"
-- 
2.1.0

[PATCH][v2 06/18] gparted: add polkit support

[Andreas Müller]

* This was missing for me and is a good test case for xfce-polkit asking for
  root's password.
* Decision to use polkit (installed?) is made at runtime. Unfortunately this
  cool solution was not my idea but stolen from [1]

[1] http://pkgs.fedoraproject.org/cgit/gparted.git

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-extended/gparted/files/gparted_polkit  | 10 +++++++++
 .../org.yoctoproject.pkexec.run-gparted.policy     | 20 ++++++++++++++++++
 .../recipes-extended/gparted/gparted_0.24.0.bb     | 24 ++++++++++++++++++++--
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-extended/gparted/files/gparted_polkit
 create mode 100644 meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy

diff --git a/meta-gnome/recipes-extended/gparted/files/gparted_polkit b/meta-gnome/recipes-extended/gparted/files/gparted_polkit
new file mode 100644
index 0000000..feabd0e
--- /dev/null
+++ b/meta-gnome/recipes-extended/gparted/files/gparted_polkit
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# polkit installed?
+if [ $(which pkexec) ]; then
+	pkexec --disable-internal-agent "%sbindir%/gparted" "$@"
+else
+	%sbindir%/gparted "$@"
+fi
+
+
diff --git a/meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy b/meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy
new file mode 100644
index 0000000..77a9192
--- /dev/null
+++ b/meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <action id="org.yoctoproject.pkexec.run-gparted">
+    <description>Run the GParted program</description>
+    <message>Authentication is required to run the GParted Partition Editor</message>
+    <icon_name>gparted</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
diff --git a/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
index 0fe95a0..2f38977 100644
--- a/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
+++ b/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb
@@ -5,14 +5,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 inherit autotools pkgconfig gtk-icon-cache
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2 \
+    file://org.yoctoproject.pkexec.run-gparted.policy \
+    file://gparted_polkit \
+"
 SRC_URI[md5sum] = "b8480274c68876acff5965d4346710e7"
 SRC_URI[sha256sum] = "02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60"
 
 DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils-native"
 
+do_install_append() {
+    # Add a script which checks if polkit is installed.
+    # If yes: a policy is requested from polkit / otherwise start as usual
+    install ${WORKDIR}/gparted_polkit ${D}${sbindir}
+    sed -i 's:%sbindir%:${sbindir}:g' ${D}${sbindir}/gparted_polkit
+    # relink menu entry to use our script
+    sed -i 's:${sbindir}/gparted:${sbindir}/gparted_polkit:g' ${D}${datadir}/applications/gparted.desktop
+
+    install -d ${D}${datadir}/polkit-1/actions
+    install ${WORKDIR}/org.yoctoproject.pkexec.run-gparted.policy ${D}${datadir}/polkit-1/actions/org.yoctoproject.pkexec.run-gparted.policy
+}
+
 EXTRA_OECONF = "--disable-scrollkeeper --disable-doc"
 
-FILES_${PN} += "${datadir}/icons ${datadir}/appdata"
+FILES_${PN} += " \
+    ${datadir}/appdata \
+    ${datadir}/icons \
+    ${datadir}/polkit-1 \
+"
 
 RDEPENDS_${PN} = "dosfstools mtools e2fsprogs"
-- 
2.1.0

[PATCH][v2 07/18] gnulib: move meta-networking -> meta-oe

[Andreas Müller]

A more common place is required for gnulib because of other recipes (e.g
fontforge) will depend on it

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../netcf => meta-oe/recipes-support/gnulib}/gnulib_git.bb                | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {meta-networking/recipes-support/netcf => meta-oe/recipes-support/gnulib}/gnulib_git.bb (100%)

diff --git a/meta-networking/recipes-support/netcf/gnulib_git.bb b/meta-oe/recipes-support/gnulib/gnulib_git.bb
similarity index 100%
rename from meta-networking/recipes-support/netcf/gnulib_git.bb
rename to meta-oe/recipes-support/gnulib/gnulib_git.bb
-- 
2.1.0

[PATCH][v2 08/18] autotools-bootstrap.bbclass: initial add

[Andreas Müller]

bootstrap is another magic script which is intended run before autotools. The
class created runs this script at the right time and ensures that sources of
gnulib are not cloned during configure.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/classes/autotools-bootstrap.bbclass | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 meta-oe/classes/autotools-bootstrap.bbclass

diff --git a/meta-oe/classes/autotools-bootstrap.bbclass b/meta-oe/classes/autotools-bootstrap.bbclass
new file mode 100644
index 0000000..8d7af1b
--- /dev/null
+++ b/meta-oe/classes/autotools-bootstrap.bbclass
@@ -0,0 +1,24 @@
+# Class to inherit when you want to build with autotools after running bootstrap
+inherit autotools
+
+DEPENDS += "gnulib"
+
+do_configure_prepend() {
+    currdir=`pwd`
+    cd ${S}
+
+    # avoid bootstrap cloning gnulib on every configure
+    cat >.gitmodules <<EOF
+[submodule "gnulib"]
+	path = gnulib
+	url = git://git.sv.gnu.org/gnulib
+EOF
+    cp -rf ${STAGING_DATADIR}/gnulib ${S}
+
+    # --force to avoid errors on reconfigure e.g if recipes changed we depend on
+    # | bootstrap: running: libtoolize --quiet
+    # | libtoolize:   error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite
+    # | ...
+    ./bootstrap --force
+    cd $currdir
+}
-- 
2.1.0

[PATCH][v2 09/18] netcf: use autotools-bootstrap.bbclass

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-networking/recipes-support/netcf/netcf_git.bb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb b/meta-networking/recipes-support/netcf/netcf_git.bb
index 8a8963e..26c738b 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -16,19 +16,13 @@ DEPENDS += "augeas libnl libxslt libxml2 gnulib"
 
 S = "${WORKDIR}/git"
 
-inherit gettext autotools-brokensep pkgconfig systemd
+inherit gettext autotools-bootstrap pkgconfig systemd
 
 EXTRA_OECONF_append_class-target = " --with-driver=redhat"
 
 PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)}"
 PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
 
-do_configure_prepend() {
-	cd ${S}
-	rm -f .gitmodules
-	./bootstrap --gnulib-srcdir=${STAGING_DATADIR}/gnulib
-}
-
 do_install_append() {
     if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
        install -d ${D}${systemd_unitdir}/system
-- 
2.1.0

[PATCH][v2 10/18] gnulib: add native extend

[Andreas Müller]

fontforge-native will require it

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/gnulib/gnulib_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/gnulib/gnulib_git.bb b/meta-oe/recipes-support/gnulib/gnulib_git.bb
index a064502..766e41a 100644
--- a/meta-oe/recipes-support/gnulib/gnulib_git.bb
+++ b/meta-oe/recipes-support/gnulib/gnulib_git.bb
@@ -30,3 +30,5 @@ do_packagedata[noexec] = "1"
 do_package_write_ipk[noexec] = "1"
 do_package_write_deb[noexec] = "1"
 do_package_write_rpm[noexec] = "1"
+
+BBCLASSEXTEND = "native"
-- 
2.1.0

[PATCH][v2 11/18] fontforge: use autotools-bootstrap.bbclass

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
index eb58d8f..5fab79c 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \
 "
 
-inherit autotools pkgconfig pythonnative distro_features_check
-
 DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool"
 DEPENDS_append_class-target = " libxi"
+
+inherit autotools-bootstrap pkgconfig pythonnative distro_features_check
+
 REQUIRED_DISTRO_FEATURES_append_class-target = " x11"
 
 SRC_URI = "git://github.com/${BPN}/${BPN}.git"
@@ -19,13 +20,6 @@ S = "${WORKDIR}/git"
 
 EXTRA_OECONF_append_class-native = " with_x=no --disable-python-extension --disable-python-scripting"
 
-do_configure_prepend() {
-    currdir=`pwd`
-    cd ${S}
-    ./bootstrap --force
-    cd $currdir
-}
-
 EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -I${B}/uthash/src'"
 
 PACKAGES =+ "${PN}-python-dbg ${PN}-python"
-- 
2.1.0

[PATCH][v2 12/18] uthash: add native extend

[Andreas Müller]

fontforge-native will require it

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/uthash/uthash_1.9.7.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/uthash/uthash_1.9.7.bb b/meta-oe/recipes-support/uthash/uthash_1.9.7.bb
index e5dde1a..82a9f2a 100644
--- a/meta-oe/recipes-support/uthash/uthash_1.9.7.bb
+++ b/meta-oe/recipes-support/uthash/uthash_1.9.7.bb
@@ -12,3 +12,5 @@ do_install () {
     install -dm755 ${D}${includedir}
     install -m 0644 ${S}/src/*.h ${D}${includedir}
 }
+
+BBCLASSEXTEND = "native"
-- 
2.1.0

[PATCH][v2 13/18] fontforge: avoid cloning uthash during do_compile

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
index 5fab79c..b50202d 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \
 "
 
-DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool"
+DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash"
 DEPENDS_append_class-target = " libxi"
 
 inherit autotools-bootstrap pkgconfig pythonnative distro_features_check
@@ -20,7 +20,14 @@ S = "${WORKDIR}/git"
 
 EXTRA_OECONF_append_class-native = " with_x=no --disable-python-extension --disable-python-scripting"
 
-EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -I${B}/uthash/src'"
+do_configure_prepend() {
+    # uthash sources are expected in uthash/src
+    currdir=`pwd`
+    cd ${S}
+    mkdir -p uthash/src
+    cp ${STAGING_INCDIR}/ut*.h uthash/src
+    cd $currdir
+}
 
 PACKAGES =+ "${PN}-python-dbg ${PN}-python"
 
-- 
2.1.0

[PATCH][v2 14/18] xfce4-whiskermenu-plugin: update to 1.5.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...kermenu-plugin_git.bb => xfce4-whiskermenu-plugin_1.5.1.bb} | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_git.bb => xfce4-whiskermenu-plugin_1.5.1.bb} (54%)

diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_git.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_1.5.1.bb
similarity index 54%
rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_git.bb
rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_1.5.1.bb
index 6af38de..22b8762 100644
--- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_git.bb
+++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_1.5.1.bb
@@ -5,10 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit xfce-panel-plugin cmake
 
-SRC_URI = " \
-    git://git.xfce.org/panel-plugins/xfce4-whiskermenu-plugin \
-"
-
-SRCREV = "2d3c03eacd78051d2ef8ee3b6a4e2bff4753680e"
-PV = "1.5.0+gitr${SRCPV}"
-S = "${WORKDIR}/git"
+SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
+SRC_URI[md5sum] = "4886fca2b485dae0e6a64c78f9dca94e"
+SRC_URI[sha256sum] = "1c7650562322867513370ab575536b67aa3712329bb60a0c91a0a70e23a8945a"
-- 
2.1.0

[PATCH][v2 15/18] cdrkit: initial add 1.1.11

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | 18 ++++++++
 ...te-a-run-test-to-determine-order-of-bitfi.patch | 53 ++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
 create mode 100644 meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch

diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
new file mode 100644
index 0000000..554b89f
--- /dev/null
+++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
@@ -0,0 +1,18 @@
+SUMMARY = "CD/DVD command line tools"
+HOMEPAGE = "http://cdrkit.org/"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
+
+# While writing download from cdrkit.org was broken so get sources from debian
+SRC_URI = " \
+    ${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
+    file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \
+"
+SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9"
+SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da"
+
+inherit cmake
+
+DEPENDS = "libcap file bzip2"
+RDEPENDS_${PN} = "perl"
diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
new file mode 100644
index 0000000..c9725cb
--- /dev/null
+++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
@@ -0,0 +1,53 @@
+From a702cd1bb5eba5a05d1098862b5b863a3f6dd558 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 10 Sep 2015 09:39:13 +0200
+Subject: [PATCH] do not create a run test to determine order of bitfields
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+taken from [1]
+
+Upstream-Status: Inappropriate [cross compile specific]
+
+[1] http://cgit.openembedded.org/openembedded/tree/recipes/cdrkit/cdrkit/xconfig.patch
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ include/CMakeLists.txt | 2 --
+ include/xconfig.h.in   | 6 +++++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index 99a69fd..e5ba8a7 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -35,8 +35,6 @@ endif(VA_LIST_IS_ARRAY)
+ INCLUDE(TestBigEndian)
+ TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+ 
+-TRY_RUN(BITFIELDS_HTOL TEST_DUMMY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_BITFIELDS_HTOL.c)
+-
+ INCLUDE(CheckIncludeFiles)
+ 
+ #SET(CMAKE_REQUIRED_INCLUDES "/usr/include;/usr/local/include")
+diff --git a/include/xconfig.h.in b/include/xconfig.h.in
+index c130600..476c00b 100644
+--- a/include/xconfig.h.in
++++ b/include/xconfig.h.in
+@@ -233,7 +233,11 @@
+ /* If using network byte order             */
+ #cmakedefine WORDS_BIGENDIAN
+ /* If high bits come first in structures   */
+-#cmakedefine BITFIELDS_HTOL
++#ifdef WORDS_BIGENDIAN
++#define BITFIELDS_HTOL
++#else
++#define BITFIELDS_LTOH
++#endif
+ #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
+ #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
+ 
+-- 
+2.1.0
+
-- 
2.1.0

[PATCH][v2 16/18] luajit: drop a note for build machine requirements

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-devtools/luajit/luajit_2.1.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.1.bb b/meta-oe/recipes-devtools/luajit/luajit_2.1.bb
index ba439d0..5cee532 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.1.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.1.bb
@@ -24,6 +24,16 @@ EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} \
                 TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" \
                 TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \
                 TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_STRIP="/bin/echo"'
+
+# Important note: On the build machine bit compatible glibc-dev and libgcc must
+# be installed. E.g if the target architecture has 32 bit (see '-m32' below),
+# 32 bit versions of glibc-dev/libgcc (e.g glibc-devel.i686 / libgcc.i686 on
+# fedora) are required.
+#
+# Otherwise the following error occurs:
+# | /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory
+# |  # include <gnu/stubs-32.h>
+
 EXTRA_OEMAKE_append_powerpc = ' HOST_CC="${BUILD_CC} -m32"'
 EXTRA_OEMAKE_append_x86 = ' HOST_CC="${BUILD_CC} -m32"'
 EXTRA_OEMAKE_append_x86-64 = ' HOST_CC="${BUILD_CC}"'
-- 
2.1.0

[PATCH][v2 17/18] samba: add cups to DEPENDS

[Andreas Müller]

| /home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux/usr/libexec/arm-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/5.2.0/ld: error: cannot find -lcups
| collect2: error: ld returned 1 exit status

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-connectivity/samba/samba_4.1.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
index 22c2bb4..03b4f75 100644
--- a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
@@ -40,7 +40,7 @@ SRC_URI[sha256sum] = "033604674936bf5c77d7df299b0626052b84a41505a6a6afe902f6274f
 
 inherit systemd waf-samba
 
-DEPENDS += "readline virtual/libiconv zlib popt talloc libtdb libtevent libldb krb5 ctdb"
+DEPENDS += "readline virtual/libiconv zlib popt talloc libtdb libtevent libldb krb5 ctdb cups"
 RDEPENDS_${PN} += "openldap"
 
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
-- 
2.1.0

[PATCH][v2 18/18] samba: install pam libraries to base_libdir

[Andreas Müller]

that's where libpam installs libraries and expects them

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-connectivity/samba/samba_4.1.12.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
index 03b4f75..ca0f241 100644
--- a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
@@ -63,7 +63,7 @@ EXTRA_OECONF += "--enable-fhs \
                  --with-piddir=${localstatedir}/run \
                  --with-sockets-dir=${localstatedir}/run/samba \
                  --with-modulesdir=${libdir}/samba \
-                 --with-pammodulesdir=${libdir}/security \
+                 --with-pammodulesdir=${base_libdir}/security \
                  --with-lockdir=${localstatedir}/lib/samba \
                  --with-cachedir=${localstatedir}/lib/samba \
                  --with-perl-lib-install-dir=${PERL_VERNDORLIB} \
@@ -113,7 +113,7 @@ do_install_append() {
 PACKAGES += "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator"
 
 FILES_${PN} += "/run \
-                ${libdir}/security/pam_smbpass.so \
+                ${base_libdir}/security/pam_smbpass.so \
                 ${libdir}/tmpfiles.d/* \
                "
 
@@ -126,12 +126,12 @@ FILES_${PN}-dbg += "${libdir}/samba/idmap/.debug/* \
                     ${libdir}/samba/nss_info/.debug/* \
                     ${libdir}/samba/ldb/.debug/* \
                     ${libdir}/samba/vfs/.debug/* \
-                    ${libdir}/security/.debug/pam_smbpass.so \
+                    ${base_libdir}/security/.debug/pam_smbpass.so \
                    "
 
-FILES_libwinbind = "${libdir}/security/pam_winbind.so"
+FILES_libwinbind = "${base_libdir}/security/pam_winbind.so"
 FILES_libwinbind += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/winbind.service', '', d)}"
-FILES_libwinbind-dbg = "${libdir}/security/.debug/pam_winbind.so"
+FILES_libwinbind-dbg = "${base_libdir}/security/.debug/pam_winbind.so"
 FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
 
 FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
-- 
2.1.0