[oe] [meta-networking][PATCH 1/3] snort : add recipe
From: Chunrong Guo b40...@freescale.com *snort - a free lightweight network intrusion detection system for UNIX and Windows Signed-off-by: Chunrong Guo b40...@freescale.com --- .../recipes-connectivity/snort/files/default | 42 ++ .../snort/files/disable-dap-address-space-id.patch | 52 +++ .../snort/files/disable-inaddr-none.patch | 75 .../recipes-connectivity/snort/files/logrotate | 12 + .../recipes-connectivity/snort/files/snort.init| 425 .../recipes-connectivity/snort/files/volatiles |2 + .../recipes-connectivity/snort/snort_2.9.4.6.bb| 83 7 files changed, 691 insertions(+), 0 deletions(-) create mode 100644 meta-networking/recipes-connectivity/snort/files/default create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch create mode 100644 meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch create mode 100644 meta-networking/recipes-connectivity/snort/files/logrotate create mode 100755 meta-networking/recipes-connectivity/snort/files/snort.init create mode 100644 meta-networking/recipes-connectivity/snort/files/volatiles create mode 100644 meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb diff --git a/meta-networking/recipes-connectivity/snort/files/default b/meta-networking/recipes-connectivity/snort/files/default new file mode 100644 index 000..afd3840 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/files/default @@ -0,0 +1,42 @@ +# Parameters for the daemon +# Add any additional parameteres here. +PARAMS=-m 027 -D -d +# +# Snort user +# This user will be used to launch snort. Notice that the +# preinst script of the package might do changes to the user +# (home directory, User Name) when the package is upgraded or +# reinstalled. So, do *not* change this to 'root' or to any other user +# unless you are sure there is no problem with those changes being introduced. +# +SNORTUSER=snort +# +# Logging directory +# Snort logs will be dropped here and this will be the home +# directory for the SNORTUSER. If you change this value you should +# change the /etc/logrotate.d/snort definition too, otherwise logs +# will not be rotated properly. +# +LOGDIR=/var/log/snort +# +# Snort group +# This is the group that the snort user will be added to. +# +SNORTGROUP=snort +# +# Allow Snort's init.d script to work if the configured interfaces +# are not available. Set this to yes if you configure Snort with +# multiple interfaces but some might not be available on boot +# (e.g. wireless interfaces) +# +# Note: In order for this to work the 'iproute' package needs to +# be installed. +ALLOW_UNAVAILABLE=no + +# Local configs +# +LOCAL_SNORT_STARTUP=boot +LOCAL_SNORT_HOME_NET=192.168.0.0/16 +LOCAL_SNORT_INTERFACE= +LOCAL_SNORT_STATS_RCPT=root +LOCAL_SNORT_STATS_THRESHOLD=1 diff --git a/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch b/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch new file mode 100644 index 000..39e5c9c --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch @@ -0,0 +1,52 @@ +Upstream-Status:Inappropriate [embedded specific] + +fix the below error: +checking for dap address space id... configure: +configure: error: cannot run test program while cross compiling + + +Signed-off-by: Chunrong Guo b40...@freescale.com + +--- a/configure.in 2013-08-23 00:06:37.239361932 -0500 b/configure.in 2013-08-23 00:07:32.860266534 -0500 +@@ -679,23 +679,23 @@ + + AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta]) + +-AC_MSG_CHECKING([for daq address space ID]) +-AC_RUN_IFELSE( +-[AC_LANG_PROGRAM( +-[[ +-#include daq.h +-]], +-[[ +- DAQ_PktHdr_t hdr; +- hdr.address_space_id = 0; +-]])], +-[have_daq_address_space_id=yes], +-[have_daq_address_space_id=no]) +-AC_MSG_RESULT($have_daq_address_space_id) +-if test x$have_daq_address_space_id = xyes; then +-AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], +-[DAQ version supports address space ID in header.]) +-fi ++#AC_MSG_CHECKING([for daq address space ID]) ++#AC_RUN_IFELSE( ++#[AC_LANG_PROGRAM( ++#[[ ++##include daq.h ++#]], ++#[[ ++# DAQ_PktHdr_t hdr; ++# hdr.address_space_id = 0; ++#]])], ++have_daq_address_space_id=yes ++#[have_daq_address_space_id=no]) ++#AC_MSG_RESULT($have_daq_address_space_id) ++#if test x$have_daq_address_space_id = xyes; then ++#AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], ++#[DAQ version supports address space ID in header.]) ++#fi + + # any sparc platform has to have this one defined. + AC_MSG_CHECKING(for sparc) diff --git a/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch b/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch new file mode 100644 index 000..9dafe63 --- /dev/null +++
[oe] [meta-networking][PATCH 2/3] libdnet: add recipe
From: Chunrong Guo b40...@freescale.com
*dumb networking library
*snort depends libdnet
Signed-off-by: Chunrong Guo b40...@freescale.com
---
.../recipes-connectivity/libdnet/libdnet_1.12.bb | 14 ++
1 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
new file mode 100644
index 000..40b5758
--- /dev/null
+++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = dumb networking library
+HOMEPAGE = http://code.google.com/p/libdnet/;
+LICENSE = BSD
+LIC_FILES_CHKSUM = file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9
+
+SRC_URI = http://libdnet.googlecode.com/files/libdnet-${PV}.tgz;
+
+SRC_URI[md5sum] = 9253ef6de1b5e28e9c9a62b882e44cc9
+SRC_URI[sha256sum] =
83b33039787cf0e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026
+
+inherit autotools
+
+acpaths = -I ./config/
+
--
1.7.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/3] snort : add recipe
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Op 16-10-13 09:11, b40...@freescale.com schreef:
From: Chunrong Guo b40...@freescale.com
*snort - a free lightweight network intrusion detection system for UNIX
and Windows
Signed-off-by: Chunrong Guo b40...@freescale.com ---
.../recipes-connectivity/snort/files/default | 42 ++
.../snort/files/disable-dap-address-space-id.patch | 52 +++
.../snort/files/disable-inaddr-none.patch | 75
.../recipes-connectivity/snort/files/logrotate | 12 +
.../recipes-connectivity/snort/files/snort.init| 425
.../recipes-connectivity/snort/files/volatiles |
2 + .../recipes-connectivity/snort/snort_2.9.4.6.bb| 83 7
files changed, 691 insertions(+), 0 deletions(-) create mode 100644
meta-networking/recipes-connectivity/snort/files/default create mode
100644
meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch
create mode 100644
meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch
create mode 100644
meta-networking/recipes-connectivity/snort/files/logrotate create mode
100755 meta-networking/recipes-connectivity/snort/files/snort.init create
mode 100644 meta-networking/recipes-connectivity/snort/files/volatiles
create mode 100644
meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb
diff --git a/meta-networking/recipes-connectivity/snort/files/default
b/meta-networking/recipes-connectivity/snort/files/default new file mode
100644 index 000..afd3840 --- /dev/null +++
b/meta-networking/recipes-connectivity/snort/files/default @@ -0,0 +1,42
@@
+LOGDIR=/var/log/snort
Hardcoded path
diff --git a/meta-networking/recipes-connectivity/snort/files/logrotate
b/meta-networking/recipes-connectivity/snort/files/logrotate new file
mode 100644 index 000..e394e2e --- /dev/null +++
b/meta-networking/recipes-connectivity/snort/files/logrotate @@ -0,0
+1,12 @@ +/var/log/snort/*.log /var/log/snort/alert {
hardcoded path
+size 1M +missingok +compress +delaycompress +rotate
10 +sharedscripts +postrotate +/etc/init.d/snort restart
hardcoded path and sysvinit specific
diff --git a/meta-networking/recipes-connectivity/snort/files/snort.init
b/meta-networking/recipes-connectivity/snort/files/snort.init new file
mode 100755 index 000..af66619 --- /dev/null +++
b/meta-networking/recipes-connectivity/snort/files/snort.init @@ -0,0
+1,425 @@
+ +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
hardcoded paths
+ +test $DEBIAN_SCRIPT_DEBUG set -v -x + +DAEMON=/usr/bin/snort
hardcoded path
+NAME=snort +DESC=Network Intrusion Detection System + +.
/etc/default/snort
hardcoded path
+COMMON=$PARAMS -l $LOGDIR -u $SNORTUSER -g $SNORTGROUP + +test -x
$DAEMON || exit 0 +test -z $LOCAL_SNORT_HOME_NET
LOCAL_SNORT_HOME_NET=192.168.0.0/16 + +# to find the lib files +cd
/etc/snort
hardcoded path
+check_root() { +if [ $(id -u) != 0 ]; then +echo You
must be root to start, stop or restart $NAME. +exit 4 +fi
does this work with busybox?
+} + +case $1 in + start) +check_root +echo Starting $DESC
$NAME + +if [ -e /etc/snort/db-pending-config ] ; then +
echo
/etc/snort/db-pending-config file found + echo Snort will not
start
as its database is not yet configured. + echo Please configure
the
database as described in + echo
/usr/share/doc/snort-{pgsql,mysql}/README-database.Debian + echo
and
remove /etc/snort/db-pending-config
Tons of hardcoded paths
+ exit 6 +fi + +if ! check_log_dir; then +
echo will not
start $DESC! + exit 5 +fi +if [
$LOCAL_SNORT_STARTUP = dialup ];
then +shift + set +e +
/etc/ppp/ip-up.d/snort $@
hardcoded path and needs RRECOMMENDS = pppd?
+ myret=0 + got_instance=0 +for interface in $interfaces;
do +
got_instance=1 + echo ($interface + +# Check
if the
interface is available: +# - only if iproute is
available +# - the interface exists +# -
the interface is up +if ! [ -x /sbin/ip ] || ( ip link
show dev $interface /dev/null 21 [ -n `ip link show up
$interface 2/dev/null` ] ) ; then
hardcoded path and needs RDEPENDS = iputils?
+ + PIDFILE=/var/run/snort_$interface.pid +
CONFIGFILE=/etc/snort/snort.$interface.conf + +#
Defaults: + fail=failed (check /var/log/syslog and
/var/log/snort) +
run=yes
paths...
+ +if [ -e $PIDFILE ] running $PIDFILE; then +
run=no +# Do not start this instance, it is
already runing +fi + +if [ $run = yes
] ; then +if [ ! -e
[oe] [PATCH 0/2] Breakpad and ktap recipes
These are a couple of recipes that we've been using internally for some time. They were developed and mostly used on a dylan-based setup. Testing has primarily been performed on ARM, both qemuarm and our custom machine. Breakpad is a crash reporting tool, that's getting a wider use. Please, let me know if there's a more efficient way (or otherwise better way) to have the bbclass generate the symbol file. Ktap is a new scripting dynamic tracing tool for Linux. This recipe will be of use until everyone is on 3.13+ kernels (ktap has been merged for the 3.13 series). The following changes since commit f8903f53db717294d63a8d79b5ef7ca34b3c189e: libhugetlbfs: install perl lib to directory perl instead of perl5 (2013-10-15 13:43:53 +0200) are available in the git repository at: git://github.com/darander/meta-oe breakpad-ktap https://github.com/darander/meta-oe/tree/breakpad-ktap Anders Darander (2): breakpad: add initial recipe ktap: add initial recipe meta-oe/classes/breakpad.bbclass | 32 ++ meta-oe/recipes-devtools/breakpad/breakpad_svn.bb | 72 +++ meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb| 19 ++ meta-oe/recipes-kernel/ktap/ktap.inc | 11 meta-oe/recipes-kernel/ktap/ktap_0.3.bb | 17 ++ 5 files changed, 151 insertions(+) create mode 100644 meta-oe/classes/breakpad.bbclass create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad_svn.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb create mode 100644 meta-oe/recipes-kernel/ktap/ktap.inc create mode 100644 meta-oe/recipes-kernel/ktap/ktap_0.3.bb -- 1.8.4.rc3 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/2] breakpad: add initial recipe
Breakpad is an open-source multi-platform crash reporting system.
Apart from the breakpad recipe, add a bbclass for applications that want
to use this library. This bbclass will set up the include path and also
generate the symbol file.
Signed-off-by: Anders Darander and...@chargestorm.se
---
meta-oe/classes/breakpad.bbclass | 32 ++
meta-oe/recipes-devtools/breakpad/breakpad_svn.bb | 72 +++
2 files changed, 104 insertions(+)
create mode 100644 meta-oe/classes/breakpad.bbclass
create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad_svn.bb
diff --git a/meta-oe/classes/breakpad.bbclass b/meta-oe/classes/breakpad.bbclass
new file mode 100644
index 000..8c49ca7
--- /dev/null
+++ b/meta-oe/classes/breakpad.bbclass
@@ -0,0 +1,32 @@
+# Class to inherit when you want to build against Breakpad.
+# Apart from inheriting this class, you need to set BREAKPAD_BIN in
+# your recipe, and make sure that you link against libbreakpad_client.a.
+
+DEPENDS += breakpad breakpad-native
+
+CFLAGS += -I${STAGING_DIR_TARGET}${includedir}/breakpad
+
+BREAKPAD_BIN ?=
+
+python () {
+breakpad_bin = d.getVar(BREAKPAD_BIN, True)
+
+if not breakpad_bin:
+ PN = d.getVar(PN, True)
+ FILE = os.path.basename(d.getVar(FILE, True))
+ bb.error(To build %s, see breakpad.bbclass for instructions on \
+ setting up your Breakpad configuration % PN)
+ raise ValueError('BREAKPAD_BIN not defined in %s' % PN)
+}
+
+# Add creation of symbols here
+PACKAGE_PREPROCESS_FUNCS += breakpad_package_preprocess
+breakpad_package_preprocess () {
+mkdir -p ${PKGD}/usr/share/breakpad-syms
+find ${D} -name ${BREAKPAD_BIN} -exec sh -c dump_syms {}
${PKGD}/usr/share/breakpad-syms/${BREAKPAD_BIN}.syms \;
+}
+
+PACKAGES =+ ${PN}-breakpad
+
+FILES_${PN}-breakpad = /usr/share/breakpad-syms
+
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb
b/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb
new file mode 100644
index 000..7c7024a
--- /dev/null
+++ b/meta-oe/recipes-devtools/breakpad/breakpad_svn.bb
@@ -0,0 +1,72 @@
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+# Applications using this library needs to add link against
libbreakpad_client.a.
+
+SUMMARY = An open-source multi-platform crash reporting system
+DESCRIPTION = Breakpad is a library and tool suite that allows you to
distribute an application to users with compiler-provided debugging information
removed, record crashes in compact \minidump\ files, send them back to your
server, and produce C and C++ stack traces from these minidumps.
+HOMEPAGE = https://code.google.com/p/google-breakpad/;
+LICENSE = BSD-3-Clause
+LIC_FILES_CHKSUM = file://COPYING;md5=c80d1a3b623f72bb85a4c75b556551df
+SECTION = libs
+
+inherit autotools
+
+BBCLASSEXTEND = native
+
+SRCREV = r1218
+SRC_URI = svn://google-breakpad.googlecode.com/svn;module=trunk;protocol=http
+S = ${WORKDIR}/trunk
+
+do_install_append() {
+install -d ${D}${includedir}
+install -d ${D}${includedir}/breakpad
+
+install -d ${D}${includedir}/breakpad/client/linux/crash_generation
+install -m 0644
${S}/src/client/linux/crash_generation/crash_generation_client.h
${D}${includedir}/breakpad/client/linux/crash_generation/crash_generation_client.h
+
+install -d ${D}${includedir}/breakpad/client/linux/handler/
+install -m 0644 ${S}/src/client/linux/handler/exception_handler.h
${D}${includedir}/breakpad/client/linux/handler/exception_handler.h
+install -m 0644 ${S}/src/client/linux/handler/minidump_descriptor.h
${D}${includedir}/breakpad/client/linux/handler/minidump_descriptor.h
+
+install -d ${D}${includedir}/breakpad/client/linux/minidump_writer
+install -m 0644 ${S}/src/client/linux/minidump_writer/linux_dumper.h
${D}${includedir}/breakpad/client/linux/minidump_writer/linux_dumper.h
+install -m 0644
${S}/src/client/linux/minidump_writer/minidump_writer.h
${D}${includedir}/breakpad/client/linux/minidump_writer/minidump_writer.h
+
+install -d ${D}${includedir}/breakpad/common
+install -m 0644 ${S}/src/common/memory.h
${D}${includedir}/breakpad/common/memory.h
+install -m 0644 ${S}/src/common/scoped_ptr.h
${D}${includedir}/breakpad/common/scoped_ptr.h
+install -m 0644 ${S}/src/common/using_std_string.h
${D}${includedir}/breakpad/common/using_std_string.h
+
+install -d ${D}${includedir}/breakpad/google_breakpad/common
+install -m 0644 ${S}/src/google_breakpad/common/breakpad_types.h
${D}${includedir}/breakpad/google_breakpad/common/breakpad_types.h
+install -m 0644 ${S}/src/google_breakpad/common/minidump_format.h
${D}${includedir}/breakpad/google_breakpad/common/minidump_format.h
+install -m 0644 ${S}/src/google_breakpad/common/minidump_cpu_amd64.h
${D}${includedir}/breakpad/google_breakpad/common/minidump_cpu_amd64.h
+install -m 0644
[oe] [meta-oe/meta-xfce 1/2] lxdm: update to latest git version
fixes crashing after first log off
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...heck-only-for-ck-connector-in-case-consol.patch | 48 --
meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 6 +--
2 files changed, 2 insertions(+), 52 deletions(-)
delete mode 100644
meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
diff --git
a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
b/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
deleted file mode 100644
index e2ba52a..000
---
a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8657bfcfc5c26382989001e9b6d18295d740c709 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= schnitzelt...@googlemail.com
-Date: Fri, 7 Jun 2013 14:13:41 +0200
-Subject: [PATCH] configure: check only for ck-connector in case consolekit is
- enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-it failed for --disable-consolekit with
-
-| lxdm.c:70:26: fatal error: ck-connector.h: No such file or directory
-| compilation terminated.
-| make[2]: *** [lxdm_binary-lxdm.o] Error 1
-
-Upstream-Status: submitted [1]
-
-[1] http://sourceforge.net/mailarchive/message.php?msg_id=31010893
-
-Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
- configure.ac |3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e21a22..49ba944 100644
a/configure.ac
-+++ b/configure.ac
-@@ -28,8 +28,6 @@ if test x$USE_PAM != xno ; then
-fi])
- fi
-
--AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
--
- # Checks for header files.
- AC_PATH_X
- AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
-@@ -102,6 +100,7 @@ if test x$enable_consolekit = xyes ; then
- AC_SUBST(CONSOLEKIT_LIBS)],[
- echo ConsoleKit devel package not found
- ])
-+ AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
- fi
-
-
---
-1.7.6.5
-
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index 97bda4c..5f9d2f4 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -8,15 +8,13 @@ SRC_URI = \
file://lxdm-pam \
file://lxdm-pam-debug \
${@base_contains(DISTRO_TYPE, debug, ,
file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch,d)} \
-file://0002-configure-check-only-for-ck-connector-in-case-consol.patch \
LXDM_PAM = ${@base_contains(DISTRO_TYPE, debug, lxdm-pam-debug,
lxdm-pam,d)}
-SRCREV = 65e7cc8fdc150c2b925eb348ce82de17dee5eb0b
-PV = 0.4.2+git${SRCPV}
+SRCREV = 07fb151a99ef99318b71f3de0afbba977b1e6267
+PV = 0.5.0+git${SRCPV}
PE = 1
-PR = r7
DEPENDS = cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango
DEPENDS += ${@base_contains(DISTRO_FEATURES, systemd, , consolekit,
d)}
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe/meta-xfce 2/2] xfconf: fix compile
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../xfconf/files/0001-Simplify-checks.patch| 112 +
meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb | 1 +
2 files changed, 113 insertions(+)
create mode 100644
meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
diff --git a/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
b/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
new file mode 100644
index 000..ef68f7a
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfconf/files/0001-Simplify-checks.patch
@@ -0,0 +1,112 @@
+From 233f7d3a9b0f98b794548433cead77633aab5f7d Mon Sep 17 00:00:00 2001
+From: Nick Schermer n...@xfce.org
+Date: Sun, 6 Jan 2013 12:46:47 +0100
+Subject: [PATCH] Simplify checks.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: backport [1]
+
+[1]
http://git.xfce.org/xfce/xfconf/commit/?id=233f7d3a9b0f98b794548433cead77633aab5f7d
+
+Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
+---
+ tests/Makefile.am | 1 -
+ tests/Makefile.inc| 9 +
+ tests/test-template.sh.in | 49 ---
+ 3 files changed, 1 insertion(+), 58 deletions(-)
+ delete mode 100644 tests/test-template.sh.in
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 57165d9..57ba7e8 100644
+--- a/tests/Makefile.am
b/tests/Makefile.am
+@@ -13,5 +13,4 @@ clean-local:
+
+ EXTRA_DIST = \
+ $(test_scripts) \
+- test-template.sh.in \
+ tests-common.h
+diff --git a/tests/Makefile.inc b/tests/Makefile.inc
+index 2ed3431..7a5a715 100644
+--- a/tests/Makefile.inc
b/tests/Makefile.inc
+@@ -13,9 +13,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+-check_SCRIPTS = $(addsuffix .sh,$(check_PROGRAMS))
+-
+-TESTS = $(check_SCRIPTS)
++TESTS = $(check_PROGRAMS)
+ TESTS_ENVIRONMENT =
XDG_CONFIG_HOME=$(top_builddir)/tests/test-xdg_config_home
XFCONFD=$(top_builddir)/xfconfd/xfconfd
+
+ AM_CFLAGS = \
+@@ -27,8 +25,3 @@ AM_CFLAGS = \
+ LIBS = \
+ $(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la
+
+-%.sh: $(top_srcdir)/tests/test-template.sh.in Makefile
+- sed -e 's/@TEST_NAME@/$@/; s/\.sh//;'
$(top_srcdir)/tests/test-template.sh.in $@
+- chmod 755 $@
+-
+-CLEANFILES = $(check_SCRIPTS)
+diff --git a/tests/test-template.sh.in b/tests/test-template.sh.in
+deleted file mode 100644
+index 2e638a8..000
+--- a/tests/test-template.sh.in
/dev/null
+@@ -1,49 +0,0 @@
+-#!/bin/sh
+-
+-cleanup() {
+-if [ $XFCONFD_PID ]; then
+-kill -TERM $XFCONFD_PID 2/dev/null
+-sleep 1
+-kill -KILL $XFCONFD_PID 2/dev/null
+-fi
+-
+-kill -TERM $DBUS_SESSION_BUS_PID 2/dev/null
+-sleep 1
+-kill -KILL $DBUS_SESSION_BUS_PID 2/dev/null
+-}
+-
+-die() {
+-[ $1 ] echo $1 2
+-cleanup
+-exit 1
+-}
+-
+-# some buildbots have problems with the tests (dbus not
+-# working properly without an X11 server).
+-if [ -n $XFCONF_SKIP_TESTS ]; then
+- echo Warning: Tests disabled, skipping @TEST_NAME@ 2
+- exit 0
+-fi
+-
+-unset DBUS_SESSION_BUS_ADDRESS
+-unset DBUS_SESSION_BUS_PID
+-unset XFCONFD_PID
+-
+-eval `dbus-launch --sh-syntax`
+-export DBUS_SESSION_BUS_ADDRESS
+-export DBUS_SESSION_BUS_PID
+-
+-[ $DBUS_SESSION_BUS_PID ] || die DBus failed to start
+-
+-trap die Interrupted INT
+-
+-eval `$XFCONFD --daemon 2/dev/null` || die Failed to start xfconfd
+-
+-export XDG_CONFIG_HOME # make sure it's exported from the makefile
+-export XDG_CONFIG_DIRS=
+-
+-./@TEST_NAME@ || die Test Failed
+-
+-cleanup
+-
+-exit 0
+--
+1.8.3.1
+
diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
index 5dceb09..4ea2b88 100644
--- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
@@ -6,6 +6,7 @@ DEPENDS = dbus-glib libxfce4util perl-native
inherit xfce
+SRC_URI += file://0001-Simplify-checks.patch
SRC_URI[md5sum] = 4ed48150a03fb5f42b455494307b7f28
SRC_URI[sha256sum] =
175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576
--
1.8.3.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
