Changes pending in O.S. Systems' tree
cover Changes pending in O.S. Systems' tree
The following changes since commit e360922f652af30c4222f447b5145706df375bfc:
klibc_1.5.25: add patches to build with 3.2 kernel headers (2012-04-24 08:07:41 +0200)
are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master
Mario Domenech Goulart (1):
net-snmp: split net-snmp-server
Otavio Salvador (1):
xserver-common: drop xinput-calibrator call as it is done by xdg now
meta-oe/recipes-extended/net-snmp/net-snmp.inc | 16 +++++++---- .../recipes-extended/net-snmp/net-snmp_5.7.1.bb | 10 +++++-- ...brate_xinput_calibrator-Xsession.d-script.patch | 27 -------------------- .../xserver-common/xserver-common_1.34.bb | 1 - 4 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch
Signature · 1 line
1.7.2.5
PATCH 1/2 net-snmp: split net-snmp-server
From: Mario Domenech Goulart <[email protected]>
net-snmp-server has been split into two packages:
net-snmp-server-snmpd and net-snmp-server-snmptrapd
net-snmp-server is now a "meta-package" which depends on net-snmp-server-snmpd and net-snmp-server-snmptrapd.
net-snmpd-server-systemd in no longer generated. It has been split into net-snmp-server-snmpd-systemd and net-snmp-server-snmptrapd-systemd.
--- meta-oe/recipes-extended/net-snmp/net-snmp.inc | 16 ++++++++++------ .../recipes-extended/net-snmp/net-snmp_5.7.1.bb | 10 +++++++--- 2 files changed, 17 insertions(+), 9 deletions(-)
meta-oe/recipes-extended/net-snmp/net-snmp.inc +10 -6
@@ -3,11 +3,13 @@ HOMEPAGE = "http://www.net-snmp.org/" LICENSE = "BSD" DEPENDS = "openssl libnl" -RDEPENDS_${PN}-server += "net-snmp-mibs" +RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs" +RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd" +RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd" RDEPENDS_${PN}-client += "net-snmp-mibs" RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})" RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})" -INC_PR = "r2" +INC_PR = "r3" inherit autotools update-rc.d siteinfo
@@ -37,17 +39,19 @@ do_install_append() { } PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-staticdev net-snmp-static net-snmp-libs \ - net-snmp-mibs net-snmp-server net-snmp-client" + net-snmp-mibs net-snmp-server net-snmp-client net-snmp-server-snmpd net-snmp-server-snmptrapd" +ALLOW_EMPTY_${PN}-server = "1" FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" FILES_${PN}-mibs = "${datadir}/snmp/mibs" -FILES_${PN}-server = "${sbindir}/* ${sysconfdir}" +FILES_${PN}-server-snmpd = "${sbindir}/snmpd ${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/init.d" +FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd ${sysconfdir}/snmp/snmptrapd.conf" FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" FILES_${PN}-dev += "${bindir}/net-snmp-config ${bindir}/mib2c ${bindir}/mib2c-update" -CONFFILES_${PN}-server = "${sysconfdir}/snmp/snmpd.conf \ - ${sysconfdir}/snmp/snmptrapd.conf" +CONFFILES_${PN}-server-snmpd = "${sysconfdir}/snmp/snmpd.conf" +CONFFILES_${PN}-server-snmptrapd = "${sysconfdir}/snmp/snmptrapd.conf" INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME_${PN}-server = "snmpd"
meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb +7 -3
@@ -17,8 +17,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no --with-systemd " EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" -SYSTEMD_PACKAGES = "${PN}-server-systemd" -SYSTEMD_SERVICE_${PN}-server-systemd = "snmpd.service snmptrapd.service" +SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \ + ${PN}-server-snmptrapd-systemd" + +SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service" +SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd = "snmptrapd.service" do_configure_prepend() { gnu-configize -f
@@ -35,4 +38,5 @@ CCACHE = "" SRC_URI[md5sum] = "c95d08fd5d93df0c11a2e1bdf0e01e0b" SRC_URI[sha256sum] = "7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f" -RDEPENDS_${PN}-server-systemd = "${PN}-server" +RDEPENDS_${PN}-server-snmpd-systemd = "${PN}-server-snmpd" +RDEPENDS_${PN}-server-snmptrapd-systemd = "${PN}-server-snmptrapd"
Signature · 1 line
1.7.2.5
PATCH 2/2 xserver-common: drop xinput-calibrator call as it is done by xdg now
In reply to Otavio SalvadorThe new xinput-calibrator package provides a xdg file that handles this logic so drop it from session.
--- ...brate_xinput_calibrator-Xsession.d-script.patch | 27 -------------------- .../xserver-common/xserver-common_1.34.bb | 1 - 2 files changed, 0 insertions(+), 28 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch
meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 2877156d5bbc11f8d8e8d6aafd138173d2a4bd3b Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Wed, 11 Apr 2012 14:31:34 +0200 -Subject: [PATCH 04/12] add Ts_Calibrate_xinput_calibrator Xsession.d script - -Signed-off-by: Martin Jansa <[email protected]> ---- - X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - create mode 100644 X11/Xsession.d/89xTs_Calibrate_xinput_calibrator - -diff --git a/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator -new file mode 100644 -index 0000000..6ef4d1e ---- /dev/null -+++ b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator -@@ -0,0 +1,7 @@ -+#!/bin/sh -+ -+if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then -+ if [ -e /etc/pointercal.xinput ] ; then -+ /usr/bin/xinput_calibrator_once.sh -+ fi -+fi --- -1.7.8.5 -
meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +0 -1
@@ -14,7 +14,6 @@ SRC_URI_append = " \ file://0001-COPYING-add-GPLv2-license-file.patch \ file://0002-add-setdpi-Xinit.d-script.patch \ file://0003-add-89xdgautostart-Xsession.d-script.patch \ - file://0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch \ file://0005-add-XWindowManager-Xsession.d-script.patch \ file://0006-add-support-for-etc-X11-xserver-system.patch \ file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \
Signature · 1 line
1.7.2.5