from:"Shakeel, Muhammad"

[OE-core] [PATCH] sysvinit-inittab: Fix getting tty device name from SERIAL_CONSOLES entries

2013-10-07 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Currently the part after "tty" in the device name go into label along with
everything after that part. For example if SERIAL_CONSOLES="115200;vt100;ttyS0"
than label=S0 but if SERIAL_CONSOLES="115200;ttyS0;vt100" than label=S0;vt100.
If SERIAL_CONSOLES="..;ttyX;..", part after 'X' should also be trimmed.

Signed-off-by: Muhammad Shakeel 
---
 .../sysvinit/sysvinit-inittab_2.88dsf.bb   |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb 
b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 23c284d..05ba410 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -22,7 +22,7 @@ do_install() {
 for i in $tmp
 do
j=`echo ${i} | sed s/\;/\ /g`
-   label=`echo ${i} | sed -e 's/^.*;tty//'`
+   label=`echo ${i} | sed -e 's/^.*;tty//' -e 's/;.*//'`
echo "$label:12345:respawn:${base_sbindir}/getty ${j}" >> 
${D}${sysconfdir}/inittab
 done
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] opkg: ignore result of opkg configure

2013-10-02 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Some packages may return error while running opkg-cl configure, during
first boot. This will fail 'ExecStart' and 'ExecStartPost' will not run.
Without 'ExecStartPost' opkg-configure service will continue to run on
successive boot attempts. 'ExecStartPost' should disable this service
after first boot irrespective of 'ExecStart' status.

Signed-off-by: Muhammad Shakeel 
---
 .../opkg/opkg/opkg-configure.service   |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/opkg/opkg/opkg-configure.service 
b/meta/recipes-devtools/opkg/opkg/opkg-configure.service
index a1c3a31..b18295b 100644
--- a/meta/recipes-devtools/opkg/opkg/opkg-configure.service
+++ b/meta/recipes-devtools/opkg/opkg/opkg-configure.service
@@ -7,7 +7,7 @@ Before=sysinit.target
 [Service]
 Type=oneshot
 EnvironmentFile=-@SYSCONFDIR@/default/postinst
-ExecStart=@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then 
@BINDIR@/opkg-cl configure > $LOGFILE 2>&1; else @BINDIR@/opkg-cl configure; fi"
+ExecStart=-@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then 
@BINDIR@/opkg-cl configure > $LOGFILE 2>&1; else @BINDIR@/opkg-cl configure; fi"
 ExecStartPost=@BASE_BINDIR@/systemctl disable opkg-configure.service
 StandardOutput=syslog
 RemainAfterExit=No
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] systemd-compat-units: Use correct run-postinsts script link

2013-10-02 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

OE-Core commit 75a14923da1ba91eddde47f0907345c19c82d6f0 has moved
run-postinsts script execution from S98 to S99 in rcS.d. run-postinsts.service
should check for this script and run it on first boot rather than
S98run-postinsts, which is for opkg/dpkg.

Signed-off-by: Muhammad Shakeel 
---
 .../systemd-compat-units/run-postinsts.service |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service 
b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
index 02c1d86..4ebc234 100644
--- a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
+++ b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
@@ -1,12 +1,12 @@
 [Unit]
 Description=Run pending postinsts
 DefaultDependencies=no
-ConditionPathExists=|/etc/rcS.d/S98run-postinsts
+ConditionPathExists=|/etc/rcS.d/S99run-postinsts
 After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
 Before=sysinit.target
 
 [Service]
-ExecStart=/etc/rcS.d/S98run-postinsts
+ExecStart=/etc/rcS.d/S99run-postinsts
 RemainAfterExit=No
 Type=oneshot
 StandardOutput=syslog
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] opkg: Use systemd service for first boot configuration

2013-09-27 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Currently opkg uses a script to configure packages during first time boot.
This script is present in rcS.d and when 'sysvinit' is disabled this
script doesn't execute. For systemd only distros this newly added service
will run the opkg configure during first boot only.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-devtools/opkg/opkg.inc|   21 ++--
 .../opkg/opkg/opkg-configure.service   |   17 
 meta/recipes-devtools/opkg/opkg_svn.bb |1 +
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg.inc 
b/meta/recipes-devtools/opkg/opkg.inc
index afe6cb0..3d56886 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -16,7 +16,13 @@ do_configure_prepend() {
sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
 }
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig systemd
+
+python () {
+if 'sysvinit' not in d.getVar("DISTRO_FEATURES", True).split():
+pn = d.getVar('PN', True)
+d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'opkg-configure.service')
+}
 
 target_localstatedir := "${localstatedir}"
 OPKGLIBDIR = "${target_localstatedir}/lib"
@@ -49,6 +55,16 @@ FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
 do_install_append() {
# We need to create the lock directory
install -d ${D}${OPKGLIBDIR}/opkg
+
+   if ${@base_contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/opkg-configure.service 
${D}${systemd_unitdir}/system/
+   sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+   -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+   -e 's,@BINDIR@,${bindir},g' \
+   -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
+   ${D}${systemd_unitdir}/system/opkg-configure.service
+   fi
 }
 
 do_install_append_class-native() {
@@ -59,7 +75,8 @@ do_install_append_class-native() {
 
 pkg_postinst_${PN} () {
 #!/bin/sh
-if [ "x$D" != "x" ] && [ -f $D${OPKGLIBDIR}/opkg/status ]; then
+if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)} && \
+   [ "x$D" != "x" ] && [ -f $D${OPKGLIBDIR}/opkg/status ]; then
install -d $D${sysconfdir}/rcS.d
 
# this happens at S98 where our good 'ole packages script used to run
diff --git a/meta/recipes-devtools/opkg/opkg/opkg-configure.service 
b/meta/recipes-devtools/opkg/opkg/opkg-configure.service
new file mode 100644
index 000..a1c3a31
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/opkg-configure.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Opkg first boot configure
+DefaultDependencies=no
+After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
+Before=sysinit.target
+
+[Service]
+Type=oneshot
+EnvironmentFile=-@SYSCONFDIR@/default/postinst
+ExecStart=@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then 
@BINDIR@/opkg-cl configure > $LOGFILE 2>&1; else @BINDIR@/opkg-cl configure; fi"
+ExecStartPost=@BASE_BINDIR@/systemctl disable opkg-configure.service
+StandardOutput=syslog
+RemainAfterExit=No
+
+[Install]
+WantedBy=basic.target
+WantedBy=sysinit.target
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb 
b/meta/recipes-devtools/opkg/opkg_svn.bb
index bc10491..cd0485f 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -3,6 +3,7 @@ require opkg.inc
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
file://no-install-recommends.patch \
file://add-exclude.patch \
+   file://opkg-configure.service \
 "
 
 S = "${WORKDIR}/trunk"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] systemd: fix ptest support

2013-09-24 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Currently do_install_ptest_base is failing because it cannot find
'test' directory in build dir, ${B}. 'test' directory is present in source
dir, ${S}. Same is true for build-aux/test-driver and test/sys.tar.xz.

Also this fixes:
QA Issue: systemd: Files/directories were installed but not shipped
  /usr/lib/udev
  /usr/lib/udev/rules.d

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-core/systemd/systemd_206.bb |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_206.bb 
b/meta/recipes-core/systemd/systemd_206.bb
index 8d0a065..02be793 100644
--- a/meta/recipes-core/systemd/systemd_206.bb
+++ b/meta/recipes-core/systemd/systemd_206.bb
@@ -117,14 +117,13 @@ do_install() {
 
 do_install_ptest () {
install -d ${D}${PTEST_PATH}/test
-   install -d ${D}${libdir}/udev/rules.d
-   install ${B}/test/* ${D}${PTEST_PATH}/test
+   install ${S}/test/* ${D}${PTEST_PATH}/test
install -m 0755  ${B}/test-udev ${D}${PTEST_PATH}/
install -d ${D}${PTEST_PATH}/build-aux
cp -rf ${B}/rules ${D}${PTEST_PATH}/
cp ${B}/Makefile ${D}${PTEST_PATH}/
-   cp ${B}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
-   tar -C ${D}${PTEST_PATH}/test -xJf ${B}/test/sys.tar.xz
+   cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
+   tar -C ${D}${PTEST_PATH}/test -xJf ${S}/test/sys.tar.xz
sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
 }
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] [v2] connman: Remove obsolete configurations from EXTRA_OECONF

2013-09-20 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

--enable-threads and --enable-fake are obsolete, unrecognized options
for connman now.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/connman/connman.inc |2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc 
b/meta/recipes-connectivity/connman/connman.inc
index 37ce3ec..12f3edd 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -21,14 +21,12 @@ EXTRA_OECONF += "\
 ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
 ac_cv_path_PPPD=${sbindir}/pppd \
 --enable-debug \
---enable-threads \
 --enable-loopback \
 --enable-ethernet \
 --enable-tools \
 --enable-test \
 --disable-polkit \
 --enable-client \
---enable-fake \
 ${@base_contains('DISTRO_FEATURES', 'systemd', 
'--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', 
d)} \
 "
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] [v2] connman: Upgrade to v1.18

2013-09-20 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

This release contains a few important bugfixes in addition
to a few new features.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/connman/connman_1.17.bb |   14 --
 meta/recipes-connectivity/connman/connman_1.18.bb |   14 ++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman_1.17.bb 
b/meta/recipes-connectivity/connman/connman_1.17.bb
deleted file mode 100644
index 461157f..000
--- a/meta/recipes-connectivity/connman/connman_1.17.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require connman.inc
-
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
-
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
-file://add_xuser_dbus_permission.patch \
-file://connman \
-"
-
-SRC_URI[md5sum] = "dd4a13f789de1b69fcddf0cf613f2d5b"
-SRC_URI[sha256sum] = 
"d31aa2e7dc9fa817c93aba973995b63506a8c83f55afe507028f09b580ef0b00"
-
-PR = "${INC_PR}.0"
-
-RRECOMMENDS_${PN} = "connman-conf"
diff --git a/meta/recipes-connectivity/connman/connman_1.18.bb 
b/meta/recipes-connectivity/connman/connman_1.18.bb
new file mode 100644
index 000..44a4a07
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.18.bb
@@ -0,0 +1,14 @@
+require connman.inc
+
+SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
+file://add_xuser_dbus_permission.patch \
+file://connman \
+"
+
+SRC_URI[md5sum] = "7578ec8f0422d34f5a4ba51b605fe576"
+SRC_URI[sha256sum] = 
"56c2ca7842be2100b6b59367845d5beec125f231af6ea505604992e0c5a69992"
+
+PR = "${INC_PR}.0"
+
+RRECOMMENDS_${PN} = "connman-conf"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] openssl: Add ca-certificates in RRECOMMENDS

2013-09-19 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

In some situations ca-certificates are required along with openssl
to communicate securely, i.e. curl trying to fetch contents through https.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/openssl/openssl.inc |2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc 
b/meta/recipes-connectivity/openssl/openssl.inc
index 78ff7ae..cf60d4b 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
 DEPENDS = "perl-native-runtime"
 
+RRECOMMENDS_${PN} = "ca-certificates"
+
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
   "
 S = "${WORKDIR}/openssl-${PV}"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] connman: Upgrade to v1.18

2013-09-19 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-This release contains a few important bugfixes in addition
to a few new features.
-Also remove some obsolete configurations from EXTRA_OECONF

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/connman/connman.inc |2 --
 meta/recipes-connectivity/connman/connman_1.17.bb |   14 --
 meta/recipes-connectivity/connman/connman_1.18.bb |   14 ++
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc 
b/meta/recipes-connectivity/connman/connman.inc
index 37ce3ec..12f3edd 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -21,14 +21,12 @@ EXTRA_OECONF += "\
 ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
 ac_cv_path_PPPD=${sbindir}/pppd \
 --enable-debug \
---enable-threads \
 --enable-loopback \
 --enable-ethernet \
 --enable-tools \
 --enable-test \
 --disable-polkit \
 --enable-client \
---enable-fake \
 ${@base_contains('DISTRO_FEATURES', 'systemd', 
'--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', 
d)} \
 "
 
diff --git a/meta/recipes-connectivity/connman/connman_1.17.bb 
b/meta/recipes-connectivity/connman/connman_1.17.bb
deleted file mode 100644
index 461157f..000
--- a/meta/recipes-connectivity/connman/connman_1.17.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require connman.inc
-
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
-
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
-file://add_xuser_dbus_permission.patch \
-file://connman \
-"
-
-SRC_URI[md5sum] = "dd4a13f789de1b69fcddf0cf613f2d5b"
-SRC_URI[sha256sum] = 
"d31aa2e7dc9fa817c93aba973995b63506a8c83f55afe507028f09b580ef0b00"
-
-PR = "${INC_PR}.0"
-
-RRECOMMENDS_${PN} = "connman-conf"
diff --git a/meta/recipes-connectivity/connman/connman_1.18.bb 
b/meta/recipes-connectivity/connman/connman_1.18.bb
new file mode 100644
index 000..44a4a07
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.18.bb
@@ -0,0 +1,14 @@
+require connman.inc
+
+SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
+file://add_xuser_dbus_permission.patch \
+file://connman \
+"
+
+SRC_URI[md5sum] = "7578ec8f0422d34f5a4ba51b605fe576"
+SRC_URI[sha256sum] = 
"56c2ca7842be2100b6b59367845d5beec125f231af6ea505604992e0c5a69992"
+
+PR = "${INC_PR}.0"
+
+RRECOMMENDS_${PN} = "connman-conf"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] connman: Fix EXTRA_OECONF

2013-09-13 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- --enable-threads and --enable-fake are obsolete, unrecognized options
now.
- --enable-bluetooth,wifi,ofono just build these technologies as plugins
and these plugins need to be installed explicitly. Our intention here
is to make these technologies available by default, if enabled. For
this we need --enable-bluetooth,wifi,ofono=builtin.
- If bluetooth is getting disabled then disable dundee as well, which
is enabled by default.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/connman/connman.inc |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc 
b/meta/recipes-connectivity/connman/connman.inc
index 37ce3ec..71ecce2 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -21,14 +21,12 @@ EXTRA_OECONF += "\
 ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
 ac_cv_path_PPPD=${sbindir}/pppd \
 --enable-debug \
---enable-threads \
 --enable-loopback \
 --enable-ethernet \
 --enable-tools \
 --enable-test \
 --disable-polkit \
 --enable-client \
---enable-fake \
 ${@base_contains('DISTRO_FEATURES', 'systemd', 
'--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', 
d)} \
 "
 
@@ -42,9 +40,9 @@ PACKAGECONFIG ??= "wispr \
 # local.conf or distro config
 # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
 
-PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
-PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
+PACKAGECONFIG[wifi] = "--enable-wifi=builtin, --disable-wifi, wpa-supplicant"
+PACKAGECONFIG[bluetooth] = "--enable-bluetooth=builtin, --disable-bluetooth 
--disable-dundee, bluez4"
+PACKAGECONFIG[3g] = "--enable-ofono=builtin, --disable-ofono, ofono"
 PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
 PACKAGECONFIG[openvpn] = "--enable-openvpn 
--with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
 PACKAGECONFIG[vpnc] = "--enable-vpnc 
--with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] oprofileui-server: Add systemd support

2013-09-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../oprofileui-server/oprofileui-server.service|6 ++
 .../oprofile/oprofileui-server_git.bb  |   13 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git 
a/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service 
b/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
new file mode 100644
index 000..1a2cbe6
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=OProfileUI Server
+After=network.target
+
+[Service]
+ExecStart=/bin/sh -c ". @SYSCONFDIR@/profile; @BINDIR@/oprofile-server"
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb 
b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index 200bab3..70a1fbf 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -6,7 +6,8 @@ PV = "0.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://git.yoctoproject.org/oprofileui \
-   file://init"
+   file://init \
+   file://oprofileui-server.service "
 
 EXTRA_OECONF += "--disable-client --enable-server"
 
@@ -15,9 +16,17 @@ RDEPENDS_${PN} = "oprofile"
 do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init 
${D}${sysconfdir}/init.d/oprofileui-server
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/oprofileui-server.service 
${D}${systemd_unitdir}/system/
+   sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+   -e 's,@BINDIR@,${bindir},g' 
${D}${systemd_unitdir}/system/oprofileui-server.service
 }
 
+inherit update-rc.d systemd
+
 INITSCRIPT_NAME = "oprofileui-server"
 INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ."
 
-inherit update-rc.d
+SYSTEMD_SERVICE_${PN} = "oprofileui-server.service"
+SYSTEMD_AUTO_ENABLE = "disable"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] apmd: Add systemd support

2013-09-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service |7 +++
 meta/recipes-bsp/apmd/apmd_3.2.2-14.bb   |   13 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service 
b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service
new file mode 100644
index 000..62d6af1
--- /dev/null
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Advanced Power Management daemon
+After=remote-fs.target
+
+[Service]
+EnvironmentFile-= @SYSCONFDIR@/default/apmd
+ExecStart=@SBINDIR@/apmd -P @SYSCONFDIR@/apm/apmd_proxy $APMD
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb 
b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
index d025387..8c4b75e 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
@@ -17,7 +17,8 @@ SRC_URI = 
"${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \
file://init \
file://default \
file://apmd_proxy \
-   file://apmd_proxy.conf"
+   file://apmd_proxy.conf \
+   file://apmd.service"
 
 SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8"
 SRC_URI[tarball.sha256sum] = 
"7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d"
@@ -27,11 +28,14 @@ SRC_URI[patch.sha256sum] = 
"7905ff96be93d725544d0040e425c42f9c05580db3c272f11cff
 
 S = "${WORKDIR}/apmd-3.2.2.orig"
 
-inherit update-rc.d
+inherit update-rc.d systemd
 
 INITSCRIPT_NAME = "apmd"
 INITSCRIPT_PARAMS = "defaults"
 
+SYSTEMD_SERVICE_${PN} = "apmd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
 do_compile() {
# apmd doesn't use whole autotools. Just libtool for installation
oe_runmake "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" apm 
apmd
@@ -63,6 +67,11 @@ do_install() {
 
cat ${WORKDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; 
s,/etc,${sysconfdir},g;' > ${D}${sysconfdir}/init.d/apmd
chmod 755 ${D}${sysconfdir}/init.d/apmd
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_unitdir}/system/
+   sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+   -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_unitdir}/system/apmd.service
 }
 
 PACKAGES =+ "libapm libapm-dev libapm-staticdev apm"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 5/5] [v6] systemd: Remove base_libdir if installed only for systemd_unitdir

2013-09-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If a recipe installs systemd_unitdir and it is a non-systemd build than
systemd.bbclass deletes systemd_unitdir (/lib/systemd/) but not
base_libdir (/lib). In this case if base_libdir is empty than following
QA Issue is reported.

ERROR: QA Issue: openssh: Files/directories were installed but not shipped
  /lib

If base_libdir was installed due to systemd_unitdir installation than for
non-systemd build it should also be removed.

Signed-off-by: Muhammad Shakeel 
---
 meta/classes/systemd.bbclass |3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 76f0e7d..8ec4992 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -168,6 +168,9 @@ python rm_systemd_unitdir (){
 systemd_unitdir = oe.path.join(d.getVar("D", True), 
d.getVar('systemd_unitdir', True))
 if os.path.exists(systemd_unitdir):
 shutil.rmtree(systemd_unitdir)
+base_libdir = oe.path.join(d.getVar("D", True), 
d.getVar('base_libdir', True))
+if (os.path.exists(base_libdir) and not os.listdir(base_libdir)):
+os.rmdir(base_libdir)
 }
 do_install[postfuncs] += "rm_systemd_unitdir "
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/5] [v6] nfs-utils: Add systemd support

2013-09-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils/nfs-mountd.service |   11 ++
 .../nfs-utils/nfs-utils/nfs-server.service |   18 ++
 .../nfs-utils/nfs-utils/nfs-statd.service  |   12 +++
 .../nfs-utils/nfs-utils/nfs-utils.conf |   35 
 .../nfs-utils/nfs-utils_1.2.8.bb   |   21 ++--
 5 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
new file mode 100644
index 000..613ddc0
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=NFS Mount Daemon
+After=rpcbind.service nfs-server.service
+Requires=rpcbind.service nfs-server.service
+
+[Service]
+EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
+ExecStart=@SBINDIR@/rpc.mountd -F $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
new file mode 100644
index 000..147d7a7
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service nfs-mountd.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
+ExecStartPre=@SBINDIR@/exportfs -r
+ExecStart=@SBINDIR@/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStop=@SBINDIR@/rpc.nfsd 0
+ExecStopPost=@SBINDIR@/exportfs -f
+ExecReload=@SBINDIR@/exportfs -r
+StandardError=syslog
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
new file mode 100644
index 000..746dacf
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFS file locking service
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+
+[Service]
+EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
+ExecStart=@SBINDIR@/rpc.statd -F $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
new file mode 100644
index 000..a1007a7
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
@@ -0,0 +1,35 @@
+# Parameters to be passed to nfs-utils (clients & server) service files.
+#
+
+# Options to pass to rpc.nfsd.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is 
"rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option.
+MOUNTD_OPTS=""
+
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index fd6d33e..e3e8136 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,11 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
-   file://nfsserver"
+   file://nfsserver \
+   file://nfs-utils.conf \
+   file://nfs-server.service \
+   file://nfs-mountd.service \
+   file://nfs-statd.service "
 
 SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
 SRC_URI[sha256sum] = 
"1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +35,10 @@ INITSCRIPT_NAME = "nfsserver"
 # in the shutdown levels, but that works fine.
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service 
nfs-statd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 # --e

[OE-core] [PATCH 3/5] [v6] rpcbind: Add systemd support

2013-09-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf |3 +++
 .../rpcbind/rpcbind/rpcbind.service|   14 ++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   16 +++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
new file mode 100644
index 000..2a4dfbc
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
@@ -0,0 +1,3 @@
+# Optional arguments passed to rpcbind.
+#
+RPCBIND_OPTS=""
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..4de28d4
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+EnvironmentFile=-@SYSCONFDIR@/rpcbind.conf
+ExecStart=@SBINDIR@/rpcbind -w $RPCBIND_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index be2897c..a75e4e1 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,8 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.conf \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +29,7 @@ SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +37,11 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+EXTRA_OECONF += " --enable-warmstarts "
+
 do_install_append () {
mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +50,11 @@ do_install_append () {
-e 's,/sbin/,${sbindir}/,g' \
${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+   install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+   sed -i -e 's,@SBINDIR@,${sbindir},g' \
+   -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+   ${D}${systemd_unitdir}/system/rpcbind.service
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/5] [v6] lighttpd: Add systemd support

2013-09-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   12 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..66a907a
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=@SBINDIR@/lighttpd -t -f @SYSCONFDIR@/lighttpd.conf
+ExecStart=@SBINDIR@/lighttpd -D -f @SYSCONFDIR@/lighttpd.conf
+ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index 6635e31..c243494 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,16 +40,25 @@ EXTRA_OECONF = " \
  --disable-static \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext systemd
 
 INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
 do_install_append() {
install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+   sed -i -e 's,@SBINDIR@,${sbindir},g' \
+   -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+   -e 's,@BASE_BINDIR@,${base_bindir},g' \
+   ${D}${systemd_unitdir}/system/lighttpd.service
 }
 
 FILES_${PN} += "${sysconfdir} /www"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/5] [v6] openssh: Add systemd support

2013-09-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 +++
 .../openssh/openssh-6.2p2/sshd@.service|9 +
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 ++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   19 +--
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..d19ab2a
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..64e009f
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-@SBINDIR@/sshd -i
+ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..2fd8a9a
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=@BINDIR@/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index c76f9ac..3a7f50d 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
 SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
 SRC_URI[sha256sum] = 
"7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
 
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
 USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd 
--shell /bin/false --user-group sshd"
@@ -41,6 +44,9 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
 INITSCRIPT_NAME_${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd@.service sshdgenkeys.service"
+
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
 
@@ -93,6 +99,15 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
+
+   install -d ${D}${systemd_unitdir}/system
+   install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+   install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_unitdir}/system
+   install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+   sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+   -e 's,@SBINDIR@,${sbindir},g' \
+   -e 's,@BINDIR@,${bindir},g' \
+   ${D}${systemd_unitdir}/system/sshd.socket 
${D}${systemd_unitdir}/system/*.service
 }
 
 ALLOW_EMPTY_${PN} = "1"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/5] [v5] lighttpd: Add systemd support

2013-08-29 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   15 +--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..66a907a
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=@SBINDIR@/lighttpd -t -f @SYSCONFDIR@/lighttpd.conf
+ExecStart=@SBINDIR@/lighttpd -D -f @SYSCONFDIR@/lighttpd.conf
+ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index 6635e31..c79ab28 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,19 +40,29 @@ EXTRA_OECONF = " \
  --disable-static \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext systemd
 
 INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 do_install_append() {
install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+   sed -i -e 's,@SBINDIR@,${sbindir},g' \
+   -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+   -e 's,@BASE_BINDIR@,${base_bindir},g' \
+   ${D}${systemd_unitdir}/system/lighttpd.service
 }
 
-FILES_${PN} += "${sysconfdir} /www"
+FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}"
 
 CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/5] [v5] nfs-utils: Add systemd support

2013-08-29 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils/nfs-mountd.service |   11 ++
 .../nfs-utils/nfs-utils/nfs-server.service |   18 ++
 .../nfs-utils/nfs-utils/nfs-statd.service  |   12 +++
 .../nfs-utils/nfs-utils/nfs-utils.conf |   35 
 .../nfs-utils/nfs-utils_1.2.8.bb   |   21 ++--
 5 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
new file mode 100644
index 000..613ddc0
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=NFS Mount Daemon
+After=rpcbind.service nfs-server.service
+Requires=rpcbind.service nfs-server.service
+
+[Service]
+EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
+ExecStart=@SBINDIR@/rpc.mountd -F $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
new file mode 100644
index 000..147d7a7
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service nfs-mountd.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
+ExecStartPre=@SBINDIR@/exportfs -r
+ExecStart=@SBINDIR@/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStop=@SBINDIR@/rpc.nfsd 0
+ExecStopPost=@SBINDIR@/exportfs -f
+ExecReload=@SBINDIR@/exportfs -r
+StandardError=syslog
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
new file mode 100644
index 000..746dacf
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFS file locking service
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+
+[Service]
+EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf
+ExecStart=@SBINDIR@/rpc.statd -F $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
new file mode 100644
index 000..a1007a7
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
@@ -0,0 +1,35 @@
+# Parameters to be passed to nfs-utils (clients & server) service files.
+#
+
+# Options to pass to rpc.nfsd.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is 
"rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option.
+MOUNTD_OPTS=""
+
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index fd6d33e..e3e8136 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,11 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
-   file://nfsserver"
+   file://nfsserver \
+   file://nfs-utils.conf \
+   file://nfs-server.service \
+   file://nfs-mountd.service \
+   file://nfs-statd.service "
 
 SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
 SRC_URI[sha256sum] = 
"1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +35,10 @@ INITSCRIPT_NAME = "nfsserver"
 # in the shutdown levels, but that works fine.
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service 
nfs-statd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 # --e

[OE-core] [PATCH 1/5] [v5] openssh: Add systemd support

2013-08-29 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 ++
 .../openssh/openssh-6.2p2/sshd@.service|9 +
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 ++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   21 ++--
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..d19ab2a
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..64e009f
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-@SBINDIR@/sshd -i
+ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..2fd8a9a
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=@BINDIR@/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index c76f9ac..cda22c4 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
 SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
 SRC_URI[sha256sum] = 
"7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
 
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
 USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd 
--shell /bin/false --user-group sshd"
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
 INITSCRIPT_NAME_${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd@.service sshdgenkeys.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
 
@@ -93,6 +100,15 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
+
+   install -d ${D}${systemd_unitdir}/system
+   install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+   install -c -m 0644 ${WORKDIR}/sshd@.service 
${D}${systemd_unitdir}/system
+   install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+   sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+   -e 's,@SBINDIR@,${sbindir},g' \
+   -e 's,@BINDIR@,${bindir},g' \
+   ${D}${systemd_unitdir}/system/sshd.socket 
${D}${systemd_unitdir}/system/*.service
 }
 
 ALLOW_EMPTY_${PN} = "1"
@@ -102,6 +118,7 @@ FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config 
${sysconfdir}/ssh/sshd_config_readonly"
+FILES_${PN}-sshd += "${systemd_unitdir}"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
 FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http

[OE-core] [PATCH 3/5] [v5] rpcbind: Add systemd support

2013-08-29 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf |3 +++
 .../rpcbind/rpcbind/rpcbind.service|   14 ++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   16 +++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
new file mode 100644
index 000..2a4dfbc
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
@@ -0,0 +1,3 @@
+# Optional arguments passed to rpcbind.
+#
+RPCBIND_OPTS=""
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..4de28d4
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+EnvironmentFile=-@SYSCONFDIR@/rpcbind.conf
+ExecStart=@SBINDIR@/rpcbind -w $RPCBIND_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index be2897c..a75e4e1 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,8 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.conf \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +29,7 @@ SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +37,11 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+EXTRA_OECONF += " --enable-warmstarts "
+
 do_install_append () {
mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +50,11 @@ do_install_append () {
-e 's,/sbin/,${sbindir}/,g' \
${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+   install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+   sed -i -e 's,@SBINDIR@,${sbindir},g' \
+   -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+   ${D}${systemd_unitdir}/system/rpcbind.service
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 5/5] [v5] systemd: Remove base_libdir if installed only for systemd_unitdir

2013-08-29 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If a recipe installs systemd_unitdir and it is a non-systemd build than
systemd.bbclass deletes systemd_unitdir (/lib/systemd/) but not
base_libdir (/lib). In this case if base_libdir is empty than following
QA Issue is reported.

ERROR: QA Issue: openssh: Files/directories were installed but not shipped
  /lib

If base_libdir was installed due to systemd_unitdir installation than for
non-systemd build it should also be removed.

Signed-off-by: Muhammad Shakeel 
---
 meta/classes/systemd.bbclass |3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 76f0e7d..8ec4992 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -168,6 +168,9 @@ python rm_systemd_unitdir (){
 systemd_unitdir = oe.path.join(d.getVar("D", True), 
d.getVar('systemd_unitdir', True))
 if os.path.exists(systemd_unitdir):
 shutil.rmtree(systemd_unitdir)
+base_libdir = oe.path.join(d.getVar("D", True), 
d.getVar('base_libdir', True))
+if (os.path.exists(base_libdir) and not os.listdir(base_libdir)):
+os.rmdir(base_libdir)
 }
 do_install[postfuncs] += "rm_systemd_unitdir "
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/5] [v4] openssh: Add systemd support

2013-08-22 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 +++
 .../openssh/openssh-6.2p2/sshd@.service|9 +
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 ++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   20 ++--
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..753a33b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=/bin/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..d118490
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..c717214
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index c76f9ac..8dac2f1 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
 SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
 SRC_URI[sha256sum] = 
"7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
 
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
 USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd 
--shell /bin/false --user-group sshd"
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
 INITSCRIPT_NAME_${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd@.service sshdgenkeys.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
 
@@ -93,6 +100,14 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+   sed -i 's,/bin/,${base_bindir}/,g' 
${D}${systemd_unitdir}/system/sshd.socket 
${D}${systemd_unitdir}/system/sshd@.service
+   sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/sshd@.service
+   sed -i 's,/usr/bin/,${bindir}/,g' 
${D}${systemd_unitdir}/system/sshdgenkeys.service
 }
 
 ALLOW_EMPTY_${PN} = "1"
@@ -102,6 +117,7 @@ FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config 
${sysconfdir}/ssh/sshd_config_readonly"
+FILES_${PN}-sshd += "${systemd_unitdir}"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
 FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openemb

[OE-core] [PATCH 3/5] [v4] rpcbind: Add systemd support

2013-08-22 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf |3 +++
 .../rpcbind/rpcbind/rpcbind.service|   14 ++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   15 ++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
new file mode 100644
index 000..2a4dfbc
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
@@ -0,0 +1,3 @@
+# Optional arguments passed to rpcbind.
+#
+RPCBIND_OPTS=""
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..fa217b9
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/rpcbind.conf
+ExecStart=/usr/sbin/rpcbind -w $RPCBIND_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index be2897c..b65c7aa 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,8 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.conf \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +29,7 @@ SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +37,11 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+EXTRA_OECONF += " --enable-warmstarts "
+
 do_install_append () {
mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +50,10 @@ do_install_append () {
-e 's,/sbin/,${sbindir}/,g' \
${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+   install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+   sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/rpcbind.service
+   sed -i 's,/etc/,${sysconfdir}/,g' 
${D}${systemd_unitdir}/system/rpcbind.service
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/5] [v4] nfs-utils: Add systemd support

2013-08-22 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils/nfs-mountd.service |   11 ++
 .../nfs-utils/nfs-utils/nfs-server.service |   18 ++
 .../nfs-utils/nfs-utils/nfs-statd.service  |   12 +++
 .../nfs-utils/nfs-utils/nfs-utils.conf |   35 
 .../nfs-utils/nfs-utils_1.2.8.bb   |   20 +--
 5 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
new file mode 100644
index 000..2e8dc03
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=NFS Mount Daemon
+After=rpcbind.service nfs-server.service
+Requires=rpcbind.service nfs-server.service
+
+[Service]
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStart=/usr/sbin/rpc.mountd -F $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
new file mode 100644
index 000..6c1eacb
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service nfs-mountd.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStartPre=/usr/sbin/exportfs -r
+ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStop=/usr/sbin/rpc.nfsd 0
+ExecStopPost=/usr/sbin/exportfs -f
+ExecReload=/usr/sbin/exportfs -r
+StandardError=syslog
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
new file mode 100644
index 000..ca53527
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFS file locking service
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+
+[Service]
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStart=/usr/sbin/rpc.statd -F $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
new file mode 100644
index 000..a1007a7
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
@@ -0,0 +1,35 @@
+# Parameters to be passed to nfs-utils (clients & server) service files.
+#
+
+# Options to pass to rpc.nfsd.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is 
"rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option.
+MOUNTD_OPTS=""
+
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index fd6d33e..f684424 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,11 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
-   file://nfsserver"
+   file://nfsserver \
+   file://nfs-utils.conf \
+   file://nfs-server.service \
+   file://nfs-mountd.service \
+   file://nfs-statd.service "
 
 SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
 SRC_URI[sha256sum] = 
"1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +35,10 @@ INITSCRIPT_NAME = "nfsserver"
 # in the shutdown levels, but that works fine.
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service 
nfs-statd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 # --enable-uuid is need for cr

[OE-core] [PATCH 2/5] [v4] lighttpd: Add systemd support

2013-08-22 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   14 --
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index 6635e31..3876fcc 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,19 +40,28 @@ EXTRA_OECONF = " \
  --disable-static \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext systemd
 
 INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 do_install_append() {
install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+   sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/lighttpd.service
+   sed -i 's,/etc/,${sysconfdir}/,g' 
${D}${systemd_unitdir}/system/lighttpd.service
+   sed -i 's,/bin/,${base_bindir}/,g' 
${D}${systemd_unitdir}/system/lighttpd.service
 }
 
-FILES_${PN} += "${sysconfdir} /www"
+FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}"
 
 CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 5/5] [v4] systemd: Remove base_libdir if installed only for systemd_unitdir

2013-08-22 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If a recipe installs systemd_unitdir and it is a non-systemd build than
systemd.bbclass deletes systemd_unitdir (/lib/systemd/) but not
base_libdir (/lib). In this case if base_libdir is empty than following
QA Issue is reported.

ERROR: QA Issue: openssh: Files/directories were installed but not shipped
  /lib

If base_libdir was installed due to systemd_unitdir installation than for
non-systemd build it should also be removed.

Signed-off-by: Muhammad Shakeel 
---
 meta/classes/systemd.bbclass |3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 76f0e7d..8ec4992 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -168,6 +168,9 @@ python rm_systemd_unitdir (){
 systemd_unitdir = oe.path.join(d.getVar("D", True), 
d.getVar('systemd_unitdir', True))
 if os.path.exists(systemd_unitdir):
 shutil.rmtree(systemd_unitdir)
+base_libdir = oe.path.join(d.getVar("D", True), 
d.getVar('base_libdir', True))
+if (os.path.exists(base_libdir) and not os.listdir(base_libdir)):
+os.rmdir(base_libdir)
 }
 do_install[postfuncs] += "rm_systemd_unitdir "
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/4] [v3] openssh: Add systemd support

2013-08-16 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 +++
 .../openssh/openssh-6.2p2/sshd@.service|9 +
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 ++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   20 ++--
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..753a33b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=/bin/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..d118490
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..c717214
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index c76f9ac..8dac2f1 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
 SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
 SRC_URI[sha256sum] = 
"7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
 
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
 USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd 
--shell /bin/false --user-group sshd"
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
 INITSCRIPT_NAME_${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket sshd@.service sshdgenkeys.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
 
@@ -93,6 +100,14 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> 
${D}${sysconfdir}/ssh/sshd_config_readonly
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+   sed -i 's,/bin/,${base_bindir}/,g' 
${D}${systemd_unitdir}/system/sshd.socket 
${D}${systemd_unitdir}/system/sshd@.service
+   sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/sshd@.service
+   sed -i 's,/usr/bin/,${bindir}/,g' 
${D}${systemd_unitdir}/system/sshdgenkeys.service
 }
 
 ALLOW_EMPTY_${PN} = "1"
@@ -102,6 +117,7 @@ FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config 
${sysconfdir}/ssh/sshd_config_readonly"
+FILES_${PN}-sshd += "${systemd_unitdir}"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
 FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openemb

[OE-core] [PATCH 3/4] [v3] rpcbind: Add systemd support

2013-08-16 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf |3 +++
 .../rpcbind/rpcbind/rpcbind.service|   14 ++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   15 ++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
new file mode 100644
index 000..2a4dfbc
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
@@ -0,0 +1,3 @@
+# Optional arguments passed to rpcbind.
+#
+RPCBIND_OPTS=""
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..fa217b9
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/rpcbind.conf
+ExecStart=/usr/sbin/rpcbind -w $RPCBIND_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index be2897c..b65c7aa 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,8 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.conf \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +29,7 @@ SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +37,11 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+EXTRA_OECONF += " --enable-warmstarts "
+
 do_install_append () {
mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +50,10 @@ do_install_append () {
-e 's,/sbin/,${sbindir}/,g' \
${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+   install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+   sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/rpcbind.service
+   sed -i 's,/etc/,${sysconfdir}/,g' 
${D}${systemd_unitdir}/system/rpcbind.service
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/4] [v3] nfs-utils: Add systemd support

2013-08-16 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils/nfs-mountd.service |   11 ++
 .../nfs-utils/nfs-utils/nfs-server.service |   18 ++
 .../nfs-utils/nfs-utils/nfs-statd.service  |   12 +++
 .../nfs-utils/nfs-utils/nfs-utils.conf |   35 
 .../nfs-utils/nfs-utils_1.2.8.bb   |   20 +--
 5 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
new file mode 100644
index 000..2e8dc03
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=NFS Mount Daemon
+After=rpcbind.service nfs-server.service
+Requires=rpcbind.service nfs-server.service
+
+[Service]
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStart=/usr/sbin/rpc.mountd -F $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
new file mode 100644
index 000..6c1eacb
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service nfs-mountd.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStartPre=/usr/sbin/exportfs -r
+ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStop=/usr/sbin/rpc.nfsd 0
+ExecStopPost=/usr/sbin/exportfs -f
+ExecReload=/usr/sbin/exportfs -r
+StandardError=syslog
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
new file mode 100644
index 000..ca53527
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFS file locking service
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+
+[Service]
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStart=/usr/sbin/rpc.statd -F $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
new file mode 100644
index 000..a1007a7
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
@@ -0,0 +1,35 @@
+# Parameters to be passed to nfs-utils (clients & server) service files.
+#
+
+# Options to pass to rpc.nfsd.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is 
"rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option.
+MOUNTD_OPTS=""
+
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index fd6d33e..f684424 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,11 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
-   file://nfsserver"
+   file://nfsserver \
+   file://nfs-utils.conf \
+   file://nfs-server.service \
+   file://nfs-mountd.service \
+   file://nfs-statd.service "
 
 SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
 SRC_URI[sha256sum] = 
"1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +35,10 @@ INITSCRIPT_NAME = "nfsserver"
 # in the shutdown levels, but that works fine.
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service 
nfs-statd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 # --enable-uuid is need for cr

[OE-core] [PATCH 2/4] [v3] lighttpd: Add systemd support

2013-08-16 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   14 --
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index 6635e31..3876fcc 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,19 +40,28 @@ EXTRA_OECONF = " \
  --disable-static \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext systemd
 
 INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 do_install_append() {
install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+   install -d ${D}${systemd_unitdir}/system
+   install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+   sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/lighttpd.service
+   sed -i 's,/etc/,${sysconfdir}/,g' 
${D}${systemd_unitdir}/system/lighttpd.service
+   sed -i 's,/bin/,${base_bindir}/,g' 
${D}${systemd_unitdir}/system/lighttpd.service
 }
 
-FILES_${PN} += "${sysconfdir} /www"
+FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}"
 
 CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] lighttpd: Replace spaces with tabs in shell function

2013-08-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

As per OE-Core convention, indentation should be TAB for shell.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..6635e31 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -45,10 +45,10 @@ INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
 do_install_append() {
-install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
-install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
-install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
-install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+   install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
+   install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
+   install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
 }
 
 FILES_${PN} += "${sysconfdir} /www"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] rpcbind: Replace spaces with tabs in shell function

2013-08-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

As per OE-Core convention, indentation should be TAB for shell.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..be2897c 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -36,11 +36,11 @@ INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
 do_install_append () {
-mv ${D}${bindir} ${D}${sbindir}
+   mv ${D}${bindir} ${D}${sbindir}
 
-install -d ${D}${sysconfdir}/init.d
-sed -e 's,/etc/,${sysconfdir}/,g' \
--e 's,/sbin/,${sbindir}/,g' \
-${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
-chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+   install -d ${D}${sysconfdir}/init.d
+   sed -e 's,/etc/,${sysconfdir}/,g' \
+   -e 's,/sbin/,${sbindir}/,g' \
+   ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
+   chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] nfs-utils: Replace spaces with tabs in shell function

2013-08-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

As per OE-Core convention, indentation should be TAB for shell.

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils_1.2.8.bb   |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index 40b897b..fd6d33e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -58,7 +58,7 @@ RDEPENDS_${PN}-stats = "python"
 # Make clean needed because the package comes with
 # precompiled 64-bit objects that break the build
 do_compile_prepend() {
-make clean
+   make clean
 }
 
 do_install_append () {
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/4] [v2] openssh: Add systemd support

2013-08-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 ++
 .../openssh/openssh-6.2p2/sshd@.service|9 +
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 ++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   21 ++--
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..753a33b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=/bin/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..d118490
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..c717214
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index ab2eefb..0821190 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
 SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
 SRC_URI[sha256sum] = 
"7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
 
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
 USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd 
--shell /bin/false --user-group sshd"
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
 INITSCRIPT_NAME_${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
 
@@ -86,6 +93,15 @@ do_install_append () {
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run 
${D}${localstatedir}
+
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+sed -i 's,/bin,${base_bindir},g' ${D}${systemd_unitdir}/system/sshd.socket
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/sshd@.service
+sed -i 's,/bin,${base_bindir},g' 
${D}${systemd_unitdir}/system/sshd@.service
+sed -i 's,/usr/bin/,${bindir}/,g' 
${D}${systemd_unitdir}/system/sshdgenkeys.service
 }
 
 ALLOW_EMPTY_${PN} = "1"
@@ -95,6 +111,7 @@ FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
+FILES_${PN}-sshd += "${systemd_unitdir}"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
 FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/4] [v2] nfs-utils: Add systemd support

2013-08-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils/nfs-mountd.service |   11 ++
 .../nfs-utils/nfs-utils/nfs-server.service |   18 +
 .../nfs-utils/nfs-utils/nfs-statd.service  |   12 ++
 .../nfs-utils/nfs-utils/nfs-utils.conf |   35 +
 .../nfs-utils/nfs-utils_1.2.8.bb   |   40 ++--
 5 files changed, 104 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
new file mode 100644
index 000..2e8dc03
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=NFS Mount Daemon
+After=rpcbind.service nfs-server.service
+Requires=rpcbind.service nfs-server.service
+
+[Service]
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStart=/usr/sbin/rpc.mountd -F $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
new file mode 100644
index 000..6c1eacb
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service nfs-mountd.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStartPre=/usr/sbin/exportfs -r
+ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStop=/usr/sbin/rpc.nfsd 0
+ExecStopPost=/usr/sbin/exportfs -f
+ExecReload=/usr/sbin/exportfs -r
+StandardError=syslog
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
new file mode 100644
index 000..ca53527
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFS file locking service
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+
+[Service]
+EnvironmentFile=-/etc/nfs-utils.conf
+ExecStart=/usr/sbin/rpc.statd -F $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
new file mode 100644
index 000..a1007a7
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
@@ -0,0 +1,35 @@
+# Parameters to be passed to nfs-utils (clients & server) service files.
+#
+
+# Options to pass to rpc.nfsd.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is 
"rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option.
+MOUNTD_OPTS=""
+
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index 40b897b..0110d02 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,11 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
-   file://nfsserver"
+   file://nfsserver \
+   file://nfs-utils.conf \
+   file://nfs-server.service \
+   file://nfs-mountd.service \
+   file://nfs-statd.service "
 
 SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
 SRC_URI[sha256sum] = 
"1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +35,10 @@ INITSCRIPT_NAME = "nfsserver"
 # in the shutdown levels, but that works fine.
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service 
nfs-statd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 # --enable-uuid is need

[OE-core] [PATCH 2/4] [v2] lighttpd: Add systemd support

2013-08-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   14 --
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..cb823f5 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,19 +40,28 @@ EXTRA_OECONF = " \
  --disable-static \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext systemd
 
 INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 do_install_append() {
 install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
+sed -i 's,/usr/sbin,${sbindir},g' 
${D}${systemd_unitdir}/system/lighttpd.service
+sed -i 's,/etc,${sysconfdir},g' 
${D}${systemd_unitdir}/system/lighttpd.service
+sed -i 's,/bin,${base_bindir},g' 
${D}${systemd_unitdir}/system/lighttpd.service
 }
 
-FILES_${PN} += "${sysconfdir} /www"
+FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}"
 
 CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/4] [v2] rpcbind: Add systemd support

2013-08-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf |3 +++
 .../rpcbind/rpcbind/rpcbind.service|   14 ++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   15 ++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
new file mode 100644
index 000..2a4dfbc
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
@@ -0,0 +1,3 @@
+# Optional arguments passed to rpcbind.
+#
+RPCBIND_OPTS=""
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..fa217b9
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/rpcbind.conf
+ExecStart=/usr/sbin/rpcbind -w $RPCBIND_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..264c50c 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,8 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.conf \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +29,7 @@ SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +37,11 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
+EXTRA_OECONF += " --enable-warmstarts "
+
 do_install_append () {
 mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +50,10 @@ do_install_append () {
 -e 's,/sbin/,${sbindir}/,g' \
 ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
 chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+sed -i 's,/usr/sbin,${sbindir},g' 
${D}${systemd_unitdir}/system/rpcbind.service
+sed -i 's,/etc,${sysconfdir},g' 
${D}${systemd_unitdir}/system/rpcbind.service
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/4] lighttpd: Add systemd support

2013-08-01 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   14 --
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..f473632 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -22,6 +22,7 @@ SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -39,19 +40,28 @@ EXTRA_OECONF = " \
  --disable-static \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext systemd
 
 INITSCRIPT_NAME = "lighttpd"
 INITSCRIPT_PARAMS = "defaults 70"
 
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
 do_install_append() {
 install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav 
${D}/www/var
 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system
+sed -i 's,/usr/sbin,${sbindir},g' 
${D}${systemd_unitdir}/system/lighttpd.service
+sed -i 's,/etc,${sysconfdir},g' 
${D}${systemd_unitdir}/system/lighttpd.service
+sed -i 's,/bin,${base_bindir},g' 
${D}${systemd_unitdir}/system/lighttpd.service
 }
 
-FILES_${PN} += "${sysconfdir} /www"
+FILES_${PN} += "${sysconfdir} /www ${systemd_unitdir}"
 
 CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf"
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/4] rpcbind: Add systemd support

2013-08-01 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../rpcbind/rpcbind/rpcbind.service|   13 +
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   10 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..a028ace
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/rpcbind
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..c73c2c7 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,7 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +28,7 @@ SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +36,9 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
 do_install_append () {
 mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +47,8 @@ do_install_append () {
 -e 's,/sbin/,${sbindir}/,g' \
 ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
 chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/rpcbind.service
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 4/4] nfs-utils: Add systemd support

2013-08-01 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils/nfs-utils.service  |   16 
 .../nfs-utils/nfs-utils_1.2.8.bb   |   13 +++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service
new file mode 100644
index 000..e480cc8
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rpc.nfsd
+ExecStart=/usr/sbin/rpc.mountd
+ExecStart=/usr/sbin/rpc.statd
+ExecStart=/usr/sbin/exportfs -a
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index 40b897b..4149865 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,8 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
-   file://nfsserver"
+   file://nfsserver \
+   file://nfs-utils.service "
 
 SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
 SRC_URI[sha256sum] = 
"1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +32,10 @@ INITSCRIPT_NAME = "nfsserver"
 # in the shutdown levels, but that works fine.
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-utils.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 # --enable-uuid is need for cross-compiling
 EXTRA_OECONF = "--with-statduser=nobody \
@@ -65,6 +69,11 @@ do_install_append () {
install -d ${D}${sysconfdir}/init.d
install -d ${D}${localstatedir}/lib/nfs/statd
install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
+
+install -d ${D}${systemd_unitdir}/system
+install ${WORKDIR}/nfs-utils.service ${D}${systemd_unitdir}/system/
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/nfs-utils.service
+
# kernel code as of 3.8 hard-codes this path as a default
install -d ${D}/var/lib/nfs/v4recovery
 
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/4] openssh: Add systemd support

2013-08-01 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

-Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 ++
 .../openssh/openssh-6.2p2/sshd@.service|9 +
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 ++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   21 ++--
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..753a33b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=/bin/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..d118490
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..c717214
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index ab2eefb..0821190 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
 SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
 SRC_URI[sha256sum] = 
"7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
 
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
 USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd 
--shell /bin/false --user-group sshd"
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
 INITSCRIPT_NAME_${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
 
@@ -86,6 +93,15 @@ do_install_append () {
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run 
${D}${localstatedir}
+
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+sed -i 's,/bin,${base_bindir},g' ${D}${systemd_unitdir}/system/sshd.socket
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/sshd@.service
+sed -i 's,/bin,${base_bindir},g' 
${D}${systemd_unitdir}/system/sshd@.service
+sed -i 's,/usr/bin/,${bindir}/,g' 
${D}${systemd_unitdir}/system/sshdgenkeys.service
 }
 
 ALLOW_EMPTY_${PN} = "1"
@@ -95,6 +111,7 @@ FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
+FILES_${PN}-sshd += "${systemd_unitdir}"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
 FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] busybox: Add syslog-init alternative only if SysV in enabled

2013-07-29 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If systemd is enabled then syslog is handled through a service file
and related files in /etc/init.d are removed. This removes following
warning:

WARNING: busybox: NOT adding alternative provide /etc/init.d/syslog:
/etc/init.d/syslog.busybox does not exist

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-core/busybox/busybox.inc |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc 
b/meta/recipes-core/busybox/busybox.inc
index acd2bfb..2f26953 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -280,10 +280,15 @@ inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "50"
 
-ALTERNATIVE_${PN}-syslog = "syslog-init syslog-startup-conf"
+ALTERNATIVE_${PN}-syslog = "syslog-startup-conf"
 
-ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog"
-ALTERNATIVE_TARGET[syslog-init] = "${sysconfdir}/init.d/syslog.${BPN}"
+python () {
+if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split():
+pn = d.getVar('PN', True)
+d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init')
+d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', 
'%s/init.d/syslog' % (d.getVar('sysconfdir', True)))
+d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', 
'%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True)))
+}
 
 ALTERNATIVE_LINK_NAME[syslog-startup-conf] = 
"${sysconfdir}/syslog-startup.conf"
 ALTERNATIVE_TARGET[syslog-startup-conf] = 
"${sysconfdir}/syslog-startup.conf.${BPN}"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] [V2] systemd: Remove init.d dir if systemd unit file is present and sysvinit not a distro feature

2013-07-29 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If systemd is supported DISTRO_FEATURE and sysvinit is not and also if
systemd_unitdir contains anything then no need to keep init.d scripts
for sysvinit compatibility.

Signed-off-by: Muhammad Shakeel 
---
 meta/classes/systemd.bbclass |   15 +++
 1 file changed, 15 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 9763faa..76f0e7d 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -170,3 +170,18 @@ python rm_systemd_unitdir (){
 shutil.rmtree(systemd_unitdir)
 }
 do_install[postfuncs] += "rm_systemd_unitdir "
+
+python rm_sysvinit_initddir (){
+import shutil
+sysv_initddir = oe.path.join(d.getVar("D", True), (d.getVar('INIT_D_DIR', 
True) or "/etc/init.d"))
+
+if ("systemd" in d.getVar("DISTRO_FEATURES", True).split() and
+"sysvinit" not in d.getVar("DISTRO_FEATURES", True).split() and
+os.path.exists(sysv_initddir)):
+systemd_unitdir = oe.path.join(d.getVar("D", True), 
d.getVar('systemd_unitdir', True), "system")
+
+# If systemd_unitdir contains anything, delete sysv_initddir
+if (os.path.exists(systemd_unitdir) and os.listdir(systemd_unitdir)):
+shutil.rmtree(sysv_initddir)
+}
+do_install[postfuncs] += "rm_sysvinit_initddir "
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] avahi: Remove unnecessary runtime dependency on sysvinit-pidof

2013-07-25 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

'pidof' is alternatively coming from busybox so no need for avahi to explicitly
rdepend on sysvinit-pidof. This unnecessarily includes sysvinit in systemd only
build.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/avahi/avahi.inc |2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc 
b/meta/recipes-connectivity/avahi/avahi.inc
index c302f87..7bb5381 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -96,8 +96,6 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
 
-RDEPENDS_avahi-daemon = "sysvinit-pidof"
-
 # uclibc has no nss
 RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
 RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] systemd: Remove init.d dir if systemd unit file is present and sysvinit not a distro feature

2013-07-23 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If systemd is supported DISTRO_FEATURE and sysvinit is not and also if
systemd_unitdir contains a service file(s) then no need to keep init.d scripts
for sysvinit compatibility.

Signed-off-by: Muhammad Shakeel 
---
 meta/classes/systemd.bbclass |   19 +++
 1 file changed, 19 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 9763faa..55f378e 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -170,3 +170,22 @@ python rm_systemd_unitdir (){
 shutil.rmtree(systemd_unitdir)
 }
 do_install[postfuncs] += "rm_systemd_unitdir "
+
+python rm_sysvinit_initddir (){
+import shutil
+if ("systemd" in d.getVar("DISTRO_FEATURES", True).split() and
+"sysvinit" not in d.getVar("DISTRO_FEATURES", True).split()):
+service_file_exists = False
+systemd_unitdir = oe.path.join(d.getVar("D", True), 
d.getVar('systemd_unitdir', True), "system")
+if os.path.exists(systemd_unitdir):
+for filename in os.listdir(systemd_unitdir):
+if filename.endswith(".service"):
+service_file_exists = True
+break
+
+if service_file_exists:
+sysv_initddir = oe.path.join(d.getVar("D", True), 
d.getVar('INIT_D_DIR', True))
+if os.path.exists(sysv_initddir):
+shutil.rmtree(sysv_initddir)
+}
+do_install[postfuncs] += "rm_sysvinit_initddir "
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] systemd: Remove systemd_unitdir if systemd is not in distro features

2013-07-19 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If systemd is not supported DISTRO_FEATURE than there is no need to
package related service files.

Signed-off-by: Muhammad Shakeel 
---
 meta/classes/systemd.bbclass |9 +
 1 file changed, 9 insertions(+)

diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 0447e53..9763faa 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -161,3 +161,12 @@ python systemd_populate_packages() {
 }
 
 PACKAGESPLITFUNCS_prepend = "systemd_populate_packages "
+
+python rm_systemd_unitdir (){
+import shutil
+if "systemd" not in d.getVar("DISTRO_FEATURES", True).split():
+systemd_unitdir = oe.path.join(d.getVar("D", True), 
d.getVar('systemd_unitdir', True))
+if os.path.exists(systemd_unitdir):
+shutil.rmtree(systemd_unitdir)
+}
+do_install[postfuncs] += "rm_systemd_unitdir "
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] update-rc.d: Remove init.d dir if sysvinit is not in distro features

2013-07-19 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

If sysvinit is not supported DISTRO_FEATURE than there is no need to
package related initialization scripts.

Signed-off-by: Muhammad Shakeel 
---
 meta/classes/update-rc.d.bbclass |9 +
 1 file changed, 9 insertions(+)

diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 5588569..946c077 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -99,3 +99,12 @@ python populate_packages_updatercd () {
 for pkg in pkgs.split():
 update_rcd_package(pkg)
 }
+
+python rm_sysvinit_initddir (){
+import shutil
+if "sysvinit" not in d.getVar("DISTRO_FEATURES", True).split():
+sysv_initddir = oe.path.join(d.getVar("D", True), 
d.getVar('INIT_D_DIR', True))
+if os.path.exists(sysv_initddir):
+shutil.rmtree(sysv_initddir)
+}
+do_install[postfuncs] += "rm_sysvinit_initddir "
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] [v2] rpcbind: Add systemd support

2013-07-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Adds systemd support in rpcbind
- Install 'sysv' related files only if distro has this feature

Signed-off-by: Muhammad Shakeel 
---
 .../rpcbind/rpcbind/rpcbind.service|   13 +++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   24 +++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..a028ace
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/rpcbind
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..01cdbe0 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,7 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +28,7 @@ SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,12 +36,23 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
 do_install_append () {
 mv ${D}${bindir} ${D}${sbindir}
 
-install -d ${D}${sysconfdir}/init.d
-sed -e 's,/etc/,${sysconfdir}/,g' \
--e 's,/sbin/,${sbindir}/,g' \
-${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
-chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+install -d ${D}${sysconfdir}/init.d
+sed -e 's,/etc/,${sysconfdir}/,g' \
+-e 's,/sbin/,${sbindir}/,g' \
+${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
+chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+fi
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/rpcbind.service 
${D}${systemd_unitdir}/system
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/rpcbind.service
+fi
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] ofono: Enabling with systemd

2013-07-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Install 'sysv' related files only if distro has this feature

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/ofono/ofono.inc |   15 ---
 meta/recipes-connectivity/ofono/ofono_1.12.bb |1 +
 meta/recipes-connectivity/ofono/ofono_git.bb  |1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc 
b/meta/recipes-connectivity/ofono/ofono.inc
index 21e564c..0804105 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -5,16 +5,25 @@ LICENSE  = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d systemd
 
 DEPENDS  = "dbus glib-2.0 udev mobile-broadband-provider-info 
${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}"
 
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"
 
+SYSTEMD_SERVICE_${PN} = "ofono.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 do_install_append() {
-  install -d ${D}${sysconfdir}/init.d/
-  install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
+if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+install -d ${D}${sysconfdir}/init.d/
+install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
+fi
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/ofono.service
+fi
 }
 
 PACKAGES =+ "${PN}-tests"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb 
b/meta/recipes-connectivity/ofono/ofono_1.12.bb
index 44ab0a6..85ef792 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb
@@ -15,5 +15,6 @@ SRC_URI[sha256sum] = 
"733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b
 EXTRA_OECONF += "\
 --enable-test \
 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', 
'--disable-bluetooth', d)} \
+${@base_contains('DISTRO_FEATURES', 'systemd', 
'--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', 
d)} \
 "
 CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb 
b/meta/recipes-connectivity/ofono/ofono_git.bb
index f79f34f..dc063e8 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -10,6 +10,7 @@ SRC_URI  = 
"git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
 
 EXTRA_OECONF += "\
 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', 
'--disable-bluetooth', d)} \
+${@base_contains('DISTRO_FEATURES', 'systemd', 
'--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', 
d)} \
 "
 
 do_configure_prepend () {
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] [v2] openssh: Enabling with systemd

2013-07-11 Thread Shakeel, Muhammad

> Will you please send .bbappend removal patches for meta-systemd layer
> when your changes in oe-core are applied? That way I don't need to keep
> track of what was moved already. Thanks

Yes, if this patch gets merged into oe-core, I'll send another patch for 
meta-systemd to remove respective bbappend.

Regards,
Shakeel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] [v2] openssh: Enabling with systemd

2013-07-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Install 'sysv' related files only if distro has this feature

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 
 .../openssh/openssh-6.2p2/sshd@.service|9 ++
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 +++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   29 +---
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..753a33b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=/bin/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..d118490
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..c717214
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index ab2eefb..b9657d5 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -26,14 +26,17 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
 SRC_URI[md5sum] = "be46174dcbb77ebb4ea88ef140685de1"
 SRC_URI[sha256sum] = 
"7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b"
 
-inherit useradd update-rc.d update-alternatives
+inherit useradd update-rc.d update-alternatives systemd
 
 USERADD_PACKAGES = "${PN}-sshd"
 USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd 
--shell /bin/false --user-group sshd"
@@ -41,6 +44,10 @@ INITSCRIPT_PACKAGES = "${PN}-sshd"
 INITSCRIPT_NAME_${PN}-sshd = "sshd"
 INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9"
 
+SYSTEMD_PACKAGES = "${PN}-sshd"
+SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket"
+SYSTEMD_AUTO_ENABLE = "enable"
+
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers"
 
@@ -82,8 +89,21 @@ do_install_append () {
install -m 0755 ${WORKDIR}/sshd 
${D}${sysconfdir}/pam.d/sshd
fi
done
-   install -d ${D}${sysconfdir}/init.d
-   install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
+
+if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
+fi
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/sshd@.service
+sed -i 's,/usr/bin/,${bindir}/,g' 
${D}${systemd_unitdir}/system/sshdgenkeys.service
+fi
+
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run 
${D}${localstatedir}
 }
@@ -95,6 +115,7 @@ FILES_${PN}-scp = "${bindir}/scp.${BPN}"
 FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
 FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
 FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config"
+FILES_${PN}-sshd += "${systemd_unitdir}"
 FILES_${PN}-sftp = "${bindir}/sftp"
 FIL

[OE-core] [PATCH] nfs-utils: Add systemd support

2013-07-10 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Adds systemd support in nfs-utils
- Install 'sysv' related files only if distro has this feature

Signed-off-by: Muhammad Shakeel 
---
 .../nfs-utils/nfs-utils/nfs-utils.service  |   16 +++
 .../nfs-utils/nfs-utils_1.2.8.bb   |   21 
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service
new file mode 100644
index 000..e480cc8
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=NFS Server
+Requires=rpcbind.service
+After=rpcbind.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rpc.nfsd
+ExecStart=/usr/sbin/rpc.mountd
+ExecStart=/usr/sbin/rpc.statd
+ExecStart=/usr/sbin/exportfs -a
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
index 40b897b..508b4b1 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb
@@ -15,7 +15,8 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd"
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
-   file://nfsserver"
+   file://nfsserver \
+   file://nfs-utils.service "
 
 SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77"
 SRC_URI[sha256sum] = 
"1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6"
@@ -31,7 +32,10 @@ INITSCRIPT_NAME = "nfsserver"
 # in the shutdown levels, but that works fine.
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
+
+SYSTEMD_SERVICE_${PN} = "nfs-utils.service"
+SYSTEMD_AUTO_ENABLE = "disable"
 
 # --enable-uuid is need for cross-compiling
 EXTRA_OECONF = "--with-statduser=nobody \
@@ -62,12 +66,21 @@ do_compile_prepend() {
 }
 
 do_install_append () {
-   install -d ${D}${sysconfdir}/init.d
install -d ${D}${localstatedir}/lib/nfs/statd
-   install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
# kernel code as of 3.8 hard-codes this path as a default
install -d ${D}/var/lib/nfs/v4recovery
 
+if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/nfsserver 
${D}${sysconfdir}/init.d/nfsserver
+fi
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install ${WORKDIR}/nfs-utils.service ${D}${systemd_unitdir}/system/
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/nfs-utils.service
+fi
+
# the following are built by CC_FOR_BUILD
rm -f ${D}${sbindir}/rpcdebug
rm -f ${D}${sbindir}/rpcgen
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] rpcbind: Add systemd support

2013-07-10 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Adds systemd support in rpcbind
- Install 'sysv' related files only if distro has this feature
- Set PR to 'r0'

Signed-off-by: Muhammad Shakeel 
---
 .../rpcbind/rpcbind/rpcbind.service|   13 ++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb |   26 ++--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service 
b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 000..a028ace
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/rpcbind
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb 
b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..ab25edf 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,7 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://fix_host_path.patch \
file://obsolete_automake_macros.patch \
${UCLIBCPATCHES} \
+   file://rpcbind.service \
   "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -25,9 +26,9 @@ UCLIBCPATCHES ?= ""
 SRC_URI[md5sum] = "1a77ddb1aaea8099ab19c351eeb26316"
 SRC_URI[sha256sum] = 
"c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3"
 
-PR = "r4"
+PR = "r0"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,12 +36,23 @@ PACKAGECONFIG[tcp-wrappers] = 
"--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
 do_install_append () {
 mv ${D}${bindir} ${D}${sbindir}
 
-install -d ${D}${sysconfdir}/init.d
-sed -e 's,/etc/,${sysconfdir}/,g' \
--e 's,/sbin/,${sbindir}/,g' \
-${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
-chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+install -d ${D}${sysconfdir}/init.d
+sed -e 's,/etc/,${sysconfdir}/,g' \
+-e 's,/sbin/,${sbindir}/,g' \
+${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
+chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+fi
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/rpcbind.service 
${D}${systemd_unitdir}/system
+sed -i 's,/usr/sbin/,${sbindir}/,g' 
${D}${systemd_unitdir}/system/rpcbind.service
+fi
 }
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] bash: Add ptest

2013-07-05 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

ptest support was already added for v4.2 but for the distros
using GPLv2 version of bash (3.2.48) this update is required.

Signed-off-by: Muhammad Shakeel 
---
 .../bash/bash-3.2.48/build-tests.patch |   44 
 meta/recipes-extended/bash/bash-3.2.48/run-ptest   |2 +
 .../bash/bash-3.2.48/test-output.patch |   25 +++
 meta/recipes-extended/bash/bash_3.2.48.bb  |3 ++
 4 files changed, 74 insertions(+)

diff --git a/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch 
b/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch
new file mode 100644
index 000..91341ee
--- /dev/null
+++ b/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch
@@ -0,0 +1,44 @@
+Add 'ptest' target to Makefile, to run tests without checking dependencies.
+
+Signed-off-by: Anders Roxell 
+Upstream-Status: Pending
+---
+diff -dNaur bash-3.2.48/Makefile.in.orig bash-3.2.48/Makefile.in
+--- bash-3.2.48/Makefile.in.orig   2006-08-17 23:03:35.0 +0500
 bash-3.2.48/Makefile.in2013-07-02 20:20:07.512709327 +0500
+@@ -803,17 +803,31 @@
+   fi
+ 
+ recho$(EXEEXT):   $(SUPPORT_SRC)recho.c
+-  @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c 
${LIBS_FOR_BUILD}
++  @$(CC) $(CCFLAGS) -o $@ $<
+ 
+ zecho$(EXEEXT):   $(SUPPORT_SRC)zecho.c
+-  @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)zecho.c 
${LIBS_FOR_BUILD}
++  @$(CC) $(CCFLAGS) -o $@ $<
+ 
+ printenv$(EXEEXT):$(SUPPORT_SRC)printenv.c
+-  @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)printenv.c 
${LIBS_FOR_BUILD}
++  @$(CC) $(CCFLAGS) -o $@ $<
+ 
+-test tests check: force $(Program) $(TESTS_SUPPORT)
++test tests check:
++  @$(MAKE) install-test
++  @$(MAKE) runtest
++
++install-test: buildtest
++ifeq ($(origin INSTALL_TEST_DIR), undefined)
+   @-test -d tests || mkdir tests
+   @cp $(TESTS_SUPPORT) tests
++else
++  @-test -d $(INSTALL_TEST_DIR) || mkdir -p $(INSTALL_TEST_DIR)
++  @cp -r $(srcdir)/tests/* $(INSTALL_TEST_DIR)/
++  @cp $(TESTS_SUPPORT) $(INSTALL_TEST_DIR)
++endif
++
++buildtest: force $(Program) $(TESTS_SUPPORT)
++
++runtest:
+   @( cd $(srcdir)/tests && \
+   PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) 
${TESTSCRIPT} )
+ 
diff --git a/meta/recipes-extended/bash/bash-3.2.48/run-ptest 
b/meta/recipes-extended/bash/bash-3.2.48/run-ptest
new file mode 100644
index 000..8dd3b99
--- /dev/null
+++ b/meta/recipes-extended/bash/bash-3.2.48/run-ptest
@@ -0,0 +1,2 @@
+#!/bin/sh
+make -k THIS_SH=/bin/bash BUILD_DIR=. runtest
diff --git a/meta/recipes-extended/bash/bash-3.2.48/test-output.patch 
b/meta/recipes-extended/bash/bash-3.2.48/test-output.patch
new file mode 100644
index 000..2b09b7d
--- /dev/null
+++ b/meta/recipes-extended/bash/bash-3.2.48/test-output.patch
@@ -0,0 +1,25 @@
+Add FAIL/PASS output to test output.
+
+Signed-off-by: Björn Stenberg 
+Upstream-Status: Pending
+---
+diff -uNr a/tests/run-all b/tests/run-all
+--- a/tests/run-all1999-10-08 17:07:46.0 +0200
 b/tests/run-all2012-10-27 21:04:18.663331887 +0200
+@@ -22,7 +22,15 @@
+   case $x in
+   $0|run-minimal|run-gprof)   ;;
+   *.orig|*~) ;;
+-  *)  echo $x ; sh $x ;;
++*)  echo $x
++ output=`sh $x`
++ if [ -n "$output" ]; then
++ echo "$output"
++ echo "FAIL: $x"
++ else
++ echo "PASS: $x"
++ fi
++ ;;
+   esac
+ done
+ 
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb 
b/meta/recipes-extended/bash/bash_3.2.48.bb
index 4e6f0f3..fe04b28 100644
--- a/meta/recipes-extended/bash/bash_3.2.48.bb
+++ b/meta/recipes-extended/bash/bash_3.2.48.bb
@@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \

${GNU_MIRROR}/bash/bash-3.2-patches/bash32-050;apply=yes;striplevel=0;name=patch002
 \

${GNU_MIRROR}/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0;name=patch003
 \
file://mkbuiltins_have_stringize.patch \
+   file://build-tests.patch \
+   file://test-output.patch \
+   file://run-ptest \
   "
 
 SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] [v3] lighttpd: Enabling with systemd

2013-07-04 Thread Shakeel, Muhammad

Please ignore this. I will send a v4 which will run the service file through 
sed.

Thanks,
Shakeel

From: Shakeel, Muhammad
Sent: Thursday, July 04, 2013 8:18 PM
To: openembedded-core@lists.openembedded.org
Cc: Shakeel, Muhammad
Subject: [PATCH] [v3] lighttpd: Enabling with systemd

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Use lighttpd service type 'simple' rather than 'oneshot'

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   11 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..d73a76a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -5,7 +5,6 @@ BUGTRACKER = 
"http://redmine.lighttpd.net/projects/lighttpd/issues";
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"

-
 SECTION = "net"
 DEPENDS = "zlib libpcre"
 RDEPENDS_${PN} += " \
@@ -18,10 +17,15 @@ RDEPENDS_${PN} += " \

 PR = "r0"

+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
 SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "

 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -49,6 +53,11 @@ do_install_append() {
 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+fi
 }

 FILES_${PN} += "${sysconfdir} /www"
--
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] [v3] lighttpd: Enabling with systemd

2013-07-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Use lighttpd service type 'simple' rather than 'oneshot'

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   11 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..d73a76a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -5,7 +5,6 @@ BUGTRACKER = 
"http://redmine.lighttpd.net/projects/lighttpd/issues";
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
 
-
 SECTION = "net"
 DEPENDS = "zlib libpcre"
 RDEPENDS_${PN} += " \
@@ -18,10 +17,15 @@ RDEPENDS_${PN} += " \
 
 PR = "r0"
 
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
 SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -49,6 +53,11 @@ do_install_append() {
 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+fi
 }
 
 FILES_${PN} += "${sysconfdir} /www"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] [dylan] lighttpd: Enabling with systemd

2013-07-01 Thread Shakeel, Muhammad



From: Paul Eggleton [paul.eggle...@linux.intel.com]
Sent: Monday, July 01, 2013 3:02 PM
To: Shakeel, Muhammad
Cc: Saul Wold; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] [dylan] lighttpd: Enabling with systemd

On Friday 28 June 2013 13:01:15 Shakeel, Muhammad wrote:
> From: Muhammad Shakeel 
>
> +file://lighttpd.service \

> You've added a reference to lighttpd.service, but the patch does not add it.

That's what I realized right after sending this patch. I have already sent a v2.
Please ignore this and see: http://patches.openembedded.org/patch/52027/

Best Regards,
Shakeel

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] openssh: Enabling with systemd

2013-07-01 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Bump PR

Signed-off-by: Muhammad Shakeel 
---
 .../openssh/openssh-6.2p2/sshd.socket  |   11 +++
 .../openssh/openssh-6.2p2/sshd@.service|9 +
 .../openssh/openssh-6.2p2/sshdgenkeys.service  |   10 ++
 meta/recipes-connectivity/openssh/openssh_6.2p2.bb |   18 --
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
new file mode 100644
index 000..753a33b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Conflicts=sshd.service
+
+[Socket]
+ExecStartPre=/bin/mkdir -p /var/run/sshd
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
+Also=sshdgenkeys.service
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
new file mode 100644
index 000..d118490
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshd@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=OpenSSH Per-Connection Daemon
+After=sshdgenkeys.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog
diff --git 
a/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service 
b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
new file mode 100644
index 000..c717214
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/sshdgenkeys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key Generation
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb 
b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index ab2eefb..dbf99d4 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "zlib openssl"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -19,6 +19,10 @@ RCONFLICTS_${PN} = "dropbear"
 RCONFLICTS_${PN}-sshd = "dropbear"
 RCONFLICTS_${PN}-keygen = "ssh-keygen"
 
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "sshd.socket"
+
 SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
file://nostrip.patch \
file://sshd_config \
@@ -26,7 +30,10 @@ SRC_URI = 
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://init \
file://openssh-CVE-2011-4327.patch \
file://mac.patch \
-   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)}"
+   ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', 
d)} \
+   file://sshd.socket \
+   file://sshd@.service \
+   file://sshdgenkeys.service "
 
 PAM_SRC_URI = "file://sshd"
 
@@ -86,6 +93,13 @@ do_install_append () {
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run 
${D}${localstatedir}
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/sshdgenkeys.service 
${D}${systemd_unitdir}/system
+fi
 }
 
 ALLOW_EMPTY_${PN} = "1"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] [dylan] lighttpd: Enabling with systemd

2013-06-28 Thread Shakeel, Muhammad

Hi Saul,

Can you please comment on the status of this patch? Can it be merged to master 
branch only?

I guess Martin is also working to move systemd-layer related changes into 
oe-core for 1.5 release and he has already updated some recipes. Should I 
consult him regarding this kind of changes?

Best Regards,
Shakeel

From: Shakeel, Muhammad
Sent: Wednesday, June 19, 2013 9:49 PM
To: openembedded-core@lists.openembedded.org
Cc: Shakeel, Muhammad
Subject: [PATCH] [dylan] lighttpd: Enabling with systemd

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Use lighttpd service type 'simple' rather than 'oneshot'

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..d73a76a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -5,7 +5,6 @@ BUGTRACKER = 
"http://redmine.lighttpd.net/projects/lighttpd/issues";
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"

-
 SECTION = "net"
 DEPENDS = "zlib libpcre"
 RDEPENDS_${PN} += " \
@@ -18,10 +17,15 @@ RDEPENDS_${PN} += " \

 PR = "r0"

+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
 SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "

 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -49,6 +53,11 @@ do_install_append() {
 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+fi
 }

 FILES_${PN} += "${sysconfdir} /www"
--
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] [v2] [dylan] lighttpd: Enabling with systemd

2013-06-19 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Use lighttpd service type 'simple' rather than 'oneshot'

Signed-off-by: Muhammad Shakeel 
---
 .../lighttpd/files/lighttpd.service|   12 
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb  |   11 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service 
b/meta/recipes-extended/lighttpd/files/lighttpd.service
new file mode 100644
index 000..a5333b6
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightning Fast Webserver With Light System Requirements
+After=network.target
+
+[Service]
+ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf
+ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..d73a76a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -5,7 +5,6 @@ BUGTRACKER = 
"http://redmine.lighttpd.net/projects/lighttpd/issues";
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
 
-
 SECTION = "net"
 DEPENDS = "zlib libpcre"
 RDEPENDS_${PN} += " \
@@ -18,10 +17,15 @@ RDEPENDS_${PN} += " \
 
 PR = "r0"
 
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
 SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -49,6 +53,11 @@ do_install_append() {
 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+fi
 }
 
 FILES_${PN} += "${sysconfdir} /www"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] [dylan] lighttpd: Enabling with systemd

2013-06-19 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

- Remove dependency on systemd layer
- Use lighttpd service type 'simple' rather than 'oneshot'

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb 
b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
index df6ce97..d73a76a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb
@@ -5,7 +5,6 @@ BUGTRACKER = 
"http://redmine.lighttpd.net/projects/lighttpd/issues";
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579"
 
-
 SECTION = "net"
 DEPENDS = "zlib libpcre"
 RDEPENDS_${PN} += " \
@@ -18,10 +17,15 @@ RDEPENDS_${PN} += " \
 
 PR = "r0"
 
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "lighttpd.service"
+
 SRC_URI = 
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
 file://index.html.lighttpd \
 file://lighttpd.conf \
 file://lighttpd \
+file://lighttpd.service \
 "
 
 SRC_URI[md5sum] = "8e2d4ae8e918d4de1aeb9842584d170b"
@@ -49,6 +53,11 @@ do_install_append() {
 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
 install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
+
+if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+install -d ${D}${systemd_unitdir}/system
+install -m 0644 ${WORKDIR}/lighttpd.service 
${D}${systemd_unitdir}/system
+fi
 }
 
 FILES_${PN} += "${sysconfdir} /www"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [CONSOLIDATED PULL 00/37] Updates and some fixes

2013-06-18 Thread Shakeel, Muhammad

Hi,

Could you please consider following commits for dylan branch? 

Muhammad Shakeel (1):
  ofono: Add run time dependency for ofono test scripts

 meta/recipes-connectivity/ofono/ofono.inc  |   2 +-

Without this patch we will see run time error while executing some of the ofono 
tests and this can be considered as bug fix.

Muhammad Shakeel (1):
  openssl: Add fix for cipher des-ede3-cfb1

.../openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch  |  22 ++
.../recipes-connectivity/openssl/openssl_1.0.1e.bb |   1 +

Without this patch we will see functional error if this cipher is used.

Sorry for not mentioning it on initial subject line.

Best Regards,
Shakeel

From: openembedded-core-boun...@lists.openembedded.org 
[openembedded-core-boun...@lists.openembedded.org] on behalf of Saul Wold 
[s...@linux.intel.com]
Sent: Thursday, June 13, 2013 9:19 PM
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [CONSOLIDATED PULL 00/37] Updates and some fixes

Richard,

This is a group of updates and some patches that have been
pulled together and built on the Autobuilder

There's a Chris patch to sstate.bbclass that needs your eyes.

Thanks
Sau!

The following changes since commit 74158c2e99c6d8631800ae80025d1cc9f19336d2:

  tune-cortexa*.inc: fix tunings for cortex a5, a7, a8, a9, a15 machines. 
(2013-06-12 17:54:28 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Andrei Dinu (1):
  gzip : upgrade to 1.6

Christopher Larson (2):
  sstate.bbclass: brute force silence fetch errors
  libnewt: split python module into libnewt-python

Felipe F. Tonello (1):
  qt: update qmake2 class to export qconfig.pri mkspec

Jonathan Liu (2):
  util-linux: update to 2.23.1
  classes/qmake_base: allow parallel make

Khem Raj (1):
  gcc: Upgrade to 4.8.1

Laurentiu Palcu (7):
  xf86-input-synaptics: upgrade to 1.7.1
  xkeyboard-config: upgrade to 2.9
  xdpyinfo: upgrade to 1.3.1
  xf86-video-intel: upgrade to 2.21.9
  xwininfo: upgrade to 1.1.3
  libdrm: upgrade to 2.4.45
  libxt: upgrade to 1.1.4

Muhammad Shakeel (1):
  ofono: Add run time dependency for ofono test scripts

Riku Voipio (1):
  qemu: update to 1.5.0

Ross Burton (6):
  runqemu: when tunctl can't be found, say what package builds it
  site: add more alignment values for at-spi2-core
  dpkg: drop the usage of create_wrapper
  python-native: add nativepython symlink
  createrepo: drop the usage of create_wrapper
  gnome-doc-utils: drop the usage of create_wrapper

Roy.Li (2):
  wpa-supplicant: Enable EXTRA_CFLAGS
  latencytop: Deprecate tracing_enabled for tracing_on

Saul Wold (11):
  socat: Update to 1.7.2.2
  cmake: Update to 2.8.11.1
  help2man: Update to 1.43.2
  cracklib: Update to 2.9.0
  cups: Update to 1.6.2
  libidn: Update to 1.27
  lsbinitscripts: Update to 9.47
  sysstat: Update to 10.1.6
  libxkbcommon: Update to 0.3.1
  libusb: Update tp 0.1.5
  nspr: Update to 4.10

Stefan Stanacar (2):
  scripts/contrib/build-perf-test.sh: add branch name and sizes to
results
  scripts/contrib/build-perf-test.sh: fix passing arguments

 meta/classes/qmake2.bbclass|   1 +
 meta/classes/qmake_base.bbclass|   2 +-
 meta/classes/sstate.bbclass|   5 +
 meta/conf/distro/include/tcmode-default.inc|   2 +-
 meta/recipes-connectivity/ofono/ofono.inc  |   2 +-
 .../socat/{socat_1.7.2.1.bb => socat_1.7.2.2.bb}   |  11 +-
 .../wpa-supplicant/wpa-supplicant-2.0.inc  |   1 +
 ...-fix-loopcxt_check_size-to-work-with-blkd.patch |  60 --
 ...etup-use-warn_size-for-regular-files-only.patch |  29 ---
 .../{util-linux_2.23.bb => util-linux_2.23.1.bb}   |   7 +-
 .../cmake/cmake-native_2.8.11.1.bb |   5 +
 meta/recipes-devtools/cmake/cmake-native_2.8.11.bb |   5 -
 .../cmake/{cmake_2.8.11.bb => cmake_2.8.11.1.bb}   |   4 +-
 meta/recipes-devtools/dpkg/dpkg.inc|  10 +-
 meta/recipes-devtools/gcc/gcc-4.8.inc  |   8 +-
 ...-native_1.41.2.bb => help2man-native_1.43.2.bb} |   5 +-
 .../recipes-devtools/python/python-native_2.7.3.bb |   6 +
 ...x-texinfo-table-markup-in-qemu-options.hx.patch | 213 -
 ...x-generating-qemu-doc.html-with-texinfo-5.patch |  54 --
 ...re_vga-Add-back-some-info-in-local-state-.patch | 114 ---
 meta/recipes-devtools/qemu/files/arm-bgr.patch |  30 ---
 .../files/fallback-to-safe-mmap_min_addr.patch |  39 
 .../recipes-devtools/qemu/files/linker-flags.patch |  25 ---
 meta/recipes-devtools/qemu/qemu.inc|   7 +-
 .../qemu/{qemu_1.4.1.bb => qemu_1.5.0.bb}  |   4 +-
 .../{cracklib_2.8.22.bb => cracklib_2.9.0.bb}  |   5 +-
 meta/recipes-extended/cups/cups16.inc  |   2 +-
 .../cups/{cups_1.6.1.bb => cups_1.6.2.bb}  |   4 +-
 .../gzip/{g

[OE-core] [PATCH] openssl: Add fix for cipher des-ede3-cfb1

2013-06-13 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Add patch file for one of the ciphers used in openssl, namely the cipher
des-ede3-cfb1. Details of the bug, without this patch, can be found here.
http://rt.openssl.org/Ticket/Display.html?id=2867

Signed-off-by: Muhammad Shakeel 
---
 .../openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch  |   22 
 .../recipes-connectivity/openssl/openssl_1.0.1e.bb |1 +
 2 files changed, 23 insertions(+)

diff --git 
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch
 
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch
new file mode 100644
index 000..cce20c6
--- /dev/null
+++ 
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch
@@ -0,0 +1,22 @@
+Upstream-Status: Submitted
+
+This patch adds the fix for one of the ciphers used in openssl, namely
+the cipher des-ede3-cfb1. Complete bug log and patch is present here:
+http://rt.openssl.org/Ticket/Display.html?id=2867
+
+Signed-Off-By: Muhammad Shakeel 
+
+diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
+index 3232cfe..df84922 100644
+===
+--- a/crypto/evp/e_des3.c
 b/crypto/evp/e_des3.c
+@@ -173,7 +173,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, 
unsigned char *out,
+ size_t n;
+ unsigned char c[1],d[1];
+ 
+-for(n=0 ; n < inl ; ++n)
++for(n=0 ; n < inl*8 ; ++n)
+   {
+   c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0;
+   DES_ede3_cfb_encrypt(c,d,1,1,
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb 
b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index 47c13a4..47b104d 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -30,6 +30,7 @@ SRC_URI += "file://configure-targets.patch \
 file://debian/debian-targets.patch \
 file://openssl_fix_for_x32.patch \
 file://find.pl \
+file://fix-cipher-des-ede3-cfb1.patch \
"
 
 SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] ofono: Add run time dependency for ofono test scripts

2013-06-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Some ofono test scripts i.e. enable-modem use python-dbus module
and this must be installed along with ofono-tests package.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-connectivity/ofono/ofono.inc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc 
b/meta/recipes-connectivity/ofono/ofono.inc
index 48513b2..21e564c 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -23,4 +23,4 @@ RDEPENDS_${PN} += "dbus"
 
 FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
 FILES_${PN}-tests = "${libdir}/ofono"
-RDEPENDS_${PN}-tests = "python python-pygobject"
+RDEPENDS_${PN}-tests = "python python-pygobject python-dbus"
-- 
1.7.9.5

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2 v4] archive-*-source.bbclass: Handle all package classes

2013-02-20 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add archiver tasks correctly for any 'IMAGE_PKGTYPE'.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   10 +++---
 meta/classes/archive-original-source.bbclass   |   10 +++---
 meta/classes/archive-patched-source.bbclass|   10 +++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index e492ce3..4fc5129 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -11,22 +11,26 @@ inherit archiver
 addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+pn = d.getVar('PN', True)
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' 
%s:do_package_write_' %pn + packaging)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
 configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
 """
-pn = d.getVar('PN', True)
 d.appendVarFlag('do_compile', 'depends', ' 
%s:do_archive_configured_sources' %pn)
 build_deps = ' %s:do_archive_configured_sources' %pn
 build_deps += ' %s:do_archive_scripts_logs' %pn
 d.appendVarFlag('do_build', 'depends', build_deps)
+d.appendVarFlag('do_archive_scripts_logs', 'depends', ' 
%s:do_package_write_' %pn + packaging)
 
 else:
 d.prependVarFlag('do_configure', 'postfuncs', 
"do_archive_configured_sources")
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index f123caf..3aea4f4 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -11,22 +11,26 @@ inherit archiver
 addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+pn = d.getVar('PN', True)
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' 
%s:do_package_write_' %pn + packaging)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
 original sources and scripts/logs in ${DEPLOY_DIR}/sources.
 """
-pn = d.getVar('PN', True)
 d.appendVarFlag('do_patch', 'depends', ' 
%s:do_archive_original_sources_patches' %pn)
 build_deps = ' %s:do_archive_original_sources_patches' %pn
 build_deps += ' %s:do_archive_scripts_logs' %pn
 d.appendVarFlag('do_build', 'depends', build_deps)
+d.appendVarFlag('do_archive_scripts_logs', 'depends', ' 
%s:do_package_write_' %pn + packaging)
 
 else:
 d.prependVarFlag('do_unpack', 'postfuncs', 
"do_archive_original_sources_patches")
diff --git a/meta/classes/archive-patched-source.bbclass 
b/meta/classes/archive-patched-source.bbclass
index f9f558e..d7ed6c8 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -11,22 +11,26 @@ inherit archiver
 addtask do_archive_patched_sources after do_patch
 
 # Get archiving package with logs(temp) and scripts(.bb and .inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+pn = d.getVar('PN', True)
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+d.appendVarFlag('do_dumpdata_create_diff_gz', 'depends', ' 
%s:do_package_write_' %pn + packaging)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
 patched sources and scripts/logs in ${DEPLOY_DIR}/sources.
 """
-pn = d.getVar('PN', True)
 d.appendVarFlag('do_configure', 'depends', ' 
%s:do_archive_patched_sources' %pn)
 build_deps = ' %s:do_archive_

[OE-core] [PATCH 1/2 v4] archiver class: Use tasks with sstate instead of pre/post funcs

2013-02-20 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add tasks to move sources, script/logs and diff/env files in
  deploy directory.
* Enable SSTATE for 'do_archive_scripts_logs' task
* Enable SSTATE for 'do_dumpdata_create_diff_gz' task
* SSTATE is not used for sources/patches archiver task because source
  archive package can result into a very large file. It will be an
  unnecessary overhead to keep sources in DL_DIR and cached-binaries.
* If 'SOURCE_ARCHIVE_PACKAGE_TYPE' is 'srpm' then use pre/post functions
  because in this case we do not want to use tasks to move sources/logs
  in DEPLOY_DIR. 'do_package_write_rpm' is responsible for handling
  archiver packages.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   49 ++--
 meta/classes/archive-original-source.bbclass   |   49 ++--
 meta/classes/archive-patched-source.bbclass|   49 ++--
 meta/classes/archiver.bbclass  |   40 +--
 4 files changed, 167 insertions(+), 20 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 1eaaf4c..e492ce3 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -8,10 +8,53 @@
 inherit archiver
 
 # Get archiving package with configured sources including patches
-do_configure[postfuncs] += "do_archive_configured_sources "
+addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+pn = d.getVar('PN', True)
+d.appendVarFlag('do_compile', 'depends', ' 
%s:do_archive_configured_sources' %pn)
+build_deps = ' %s:do_archive_configured_sources' %pn
+build_deps += ' %s:do_archive_scripts_logs' %pn
+d.appendVarFlag('do_build', 'depends', build_deps)
+
+else:
+d.prependVarFlag('do_configure', 'postfuncs', 
"do_archive_configured_sources")
+d.prependVarFlag('do_package_write_rpm', 'prefuncs', 
"do_archive_scripts_logs")
+}
+
+ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
+ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/"
+ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/"
+
+SSTATETASKS += "do_archive_scripts_logs"
+do_archive_scripts_logs[sstate-name] = "archive_scripts_logs"
+do_archive_scripts_logs[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}"
+do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_archive_scripts_logs_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_archive_scripts_logs_setscene
+
+SSTATETASKS += "do_dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}"
+do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_dumpdata_create_diff_gz_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_dumpdata_create_diff_gz_setscene
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 1b3f8d0..f123caf 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -8,10 +8,53 @@
 inherit archiver
 
 # Get original sources archiving package with patches
-do_unpack[postfuncs] += "do_archive_original_sources_patches "
+addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+original sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+pn = d.getVar('PN', True)
+d.appendVarFlag('do_patch', 'depends', ' 
%s:do_archive_original_sources_patches' %pn)
+build_deps = ' %s:do_archive_original_

Re: [OE-core] [PATCH 1/2 v3] archiver class: Use tasks instead of pre/post funcs with sstate

2013-02-18 Thread Shakeel, Muhammad

Hi Richard,

I did try deptask but 
d.appendVarFlag('do_patch', 'deptask', ' do_archive_original_sources_patches')

doesn't make do_patch dependent on do_archive_original_sources_patches. Do you 
think it is a bug and needs to be fixed?

Use of 'deps' or 'recrdeps' adds the above dependency. I believe 'recrdeps' can 
introduce cyclic dependency so I didn't use it.
What is your suggestion on this?

Regards,
Shakeel

From: Richard Purdie [richard.pur...@linuxfoundation.org]
Sent: Tuesday, January 22, 2013 8:41 PM
To: Shakeel, Muhammad
Cc: openembedded-core@lists.openembedded.org; Larson, Chris
Subject: Re: [OE-core] [PATCH 1/2 v3] archiver class: Use tasks instead of 
pre/post funcs with sstate

Did you try using deptask instead of deps as I suggested in the previous
feedback?

Cheers,

Richard




___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2 v3] archive-*-source.bbclass: Handle all package classes

2013-01-22 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add archiver tasks correctly for any 'IMAGE_PKGTYPE'.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |8 ++--
 meta/classes/archive-original-source.bbclass   |8 ++--
 meta/classes/archive-patched-source.bbclass|8 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index ae70be3..8323fda 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -11,12 +11,15 @@ inherit archiver
 addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+d.appendVarFlag('do_dumpdata_create_diff_gz', 'recrdeptask', ' 
do_package_write_' + packaging)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -24,6 +27,7 @@ python () {
 """
 d.appendVarFlag('do_compile', 'deps', 
['do_archive_configured_sources'])
 d.appendVarFlag('do_build', 'recrdeptask', ' 
do_archive_configured_sources')
+d.appendVarFlag('do_archive_scripts_logs', 'recrdeptask', ' 
do_package_write_' + packaging)
 d.appendVarFlag('do_build', 'deps', ['do_archive_scripts_logs'])
 
 else:
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index f668f3e..f61f82b 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -11,12 +11,15 @@ inherit archiver
 addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+d.appendVarFlag('do_dumpdata_create_diff_gz', 'recrdeptask', ' 
do_package_write_' + packaging)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -24,6 +27,7 @@ python () {
 """
 d.appendVarFlag('do_patch', 'deps', 
['do_archive_original_sources_patches'])
 d.appendVarFlag('do_build', 'recrdeptask', ' 
do_archive_original_sources_patches')
+d.appendVarFlag('do_archive_scripts_logs', 'recrdeptask', ' 
do_package_write_' + packaging)
 d.appendVarFlag('do_build', 'deps', ['do_archive_scripts_logs'])
 
 else:
diff --git a/meta/classes/archive-patched-source.bbclass 
b/meta/classes/archive-patched-source.bbclass
index daadaae..7644a6e 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -11,12 +11,15 @@ inherit archiver
 addtask do_archive_patched_sources after do_patch
 
 # Get archiving package with logs(temp) and scripts(.bb and .inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+d.appendVarFlag('do_dumpdata_create_diff_gz', 'recrdeptask', ' 
do_package_write_' + packaging)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -24,6 +27,7 @@ python () {
 """
 d.appendVarFlag('do_configure', 'deps', ['do_archive_patched_sources'])
 d.appendVarFlag('do_build', 'recrdeptask', ' 
do_archive_patched_sources')
+d.appendVarFlag('do_archive_scripts_logs', 'recrdeptask', ' 
do_package_write_' + packaging)
 d.appendVarFlag('do_build', 'deps', ['do_archive_scripts_logs'])
 
 else:
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2 v3] archiver class: Use tasks instead of pre/post funcs with sstate

2013-01-22 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add tasks to move sources, script/logs and diff/env files in
  deploy directory.
* Enable SSTATE for 'do_archive_scripts_logs' task
* Enable SSTATE for 'do_dumpdata_create_diff_gz' task
* SSTATE is not used for sources/patches archiver task because source
  archive package can result into a very large file. It will be an
  unnecessary overhead to keep sources in DL_DIR and cached-binaries.
* If 'SOURCE_ARCHIVE_PACKAGE_TYPE' is 'srpm' then use pre/post functions
  because in this case we do not want to use tasks to move sources/logs
  in DEPLOY_DIR. 'do_package_write_rpm' is responsible for handling
  archiver packages.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   47 ++--
 meta/classes/archive-original-source.bbclass   |   47 ++--
 meta/classes/archive-patched-source.bbclass|   47 ++--
 meta/classes/archiver.bbclass  |   40 ++--
 4 files changed, 161 insertions(+), 20 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 1eaaf4c..ae70be3 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -8,10 +8,51 @@
 inherit archiver
 
 # Get archiving package with configured sources including patches
-do_configure[postfuncs] += "do_archive_configured_sources "
+addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+d.appendVarFlag('do_compile', 'deps', 
['do_archive_configured_sources'])
+d.appendVarFlag('do_build', 'recrdeptask', ' 
do_archive_configured_sources')
+d.appendVarFlag('do_build', 'deps', ['do_archive_scripts_logs'])
+
+else:
+d.prependVarFlag('do_configure', 'postfuncs', 
"do_archive_configured_sources")
+d.prependVarFlag('do_package_write_rpm', 'prefuncs', 
"do_archive_scripts_logs")
+}
+
+ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
+ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/"
+ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/"
+
+SSTATETASKS += "do_archive_scripts_logs"
+do_archive_scripts_logs[sstate-name] = "archive_scripts_logs"
+do_archive_scripts_logs[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}"
+do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_archive_scripts_logs_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_archive_scripts_logs_setscene
+
+SSTATETASKS += "do_dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}"
+do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_dumpdata_create_diff_gz_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_dumpdata_create_diff_gz_setscene
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 1b3f8d0..f668f3e 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -8,10 +8,51 @@
 inherit archiver
 
 # Get original sources archiving package with patches
-do_unpack[postfuncs] += "do_archive_original_sources_patches "
+addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+original sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+d.appendVarFlag('do_patch', 'deps', 
['do_archive_original_sources_patches'])
+d.appendVarFlag('do_build', 'recrdeptask', ' 
do_archive_original_sources_patches')
+d.appendVarFlag('do_build', 'deps', ['do_archive_s

Re: [OE-core] [PATCH 2/2 v2] archive-*-source.bbclass: Handle all package classes

2013-01-16 Thread Shakeel, Muhammad

Thanks for your valuable feedback. I will rework the patch as per your 
suggestion and will send a v3 after testing.

Regards,
--Shakeel

From: Richard Purdie [richard.pur...@linuxfoundation.org]
Sent: Wednesday, January 16, 2013 4:48 PM
To: Shakeel, Muhammad
Cc: openembedded-core@lists.openembedded.org; Larson, Chris
Subject: Re: [OE-core] [PATCH 2/2 v2] archive-*-source.bbclass: Handle all 
package classes

On Mon, 2013-01-14 at 18:48 +0500, Shakeel, Muhammad wrote:
> From: Muhammad Shakeel 
>
> * Add archiver tasks correctly for any 'IMAGE_PKGTYPE'.
>
> [YOCTO #3449]
>
> Signed-off-by: Muhammad Shakeel 
> Signed-off-by: Noor Ahsan 
> Signed-off-by: Christopher Larson 
> ---
>  meta/classes/archive-configured-source.bbclass |   15 +--
>  meta/classes/archive-original-source.bbclass   |   15 +--
>  meta/classes/archive-patched-source.bbclass|   15 +--
>  3 files changed, 39 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/archive-configured-source.bbclass 
> b/meta/classes/archive-configured-source.bbclass
> index 64799e3..50838e6 100644
> --- a/meta/classes/archive-configured-source.bbclass
> +++ b/meta/classes/archive-configured-source.bbclass
> @@ -11,12 +11,19 @@ inherit archiver
>  addtask do_archive_configured_sources after do_configure
>
>  # Get archiving package with temp(logs) and scripts(.bb and inc files)
> -addtask do_archive_scripts_logs after do_package_write_rpm
> +addtask do_archive_scripts_logs
>
>  # Get dump date and create diff file
> -addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
> +addtask do_dumpdata_create_diff_gz before do_build
>
>  python () {
> +packaging = d.getVar('IMAGE_PKGTYPE', True)
> +write_package_task = 'do_package_write_' + packaging
> +
> +deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
> +deps.append(write_package_task)
> +d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
> +
>  if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
>  """
>  If package type is not 'srpm' then add tasks to move archive 
> packages of
> @@ -30,6 +37,10 @@ python () {
>  recrdeptask += ' do_archive_configured_sources '
>  d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
>
> +deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
> +deps.append(write_package_task)
> +d.setVarFlag('do_archive_scripts_logs', 'deps', deps)

Looking at the patch series, this is code introducing users of the
'deps' flag outside of externalsrc.bbclass (which has some nasty reasons
it currently pokes bitbake internals).

I'd like to not introduce usage of the flag so can you please change
these references to things like:

d.appendVarFlag('do_archive_scripts_logs', 'deps', ' do_package_write_' + 
packaging)

Use of appendVarFlag applies anywhere you currently do a set, append,
set operation, its just neater code and gives us some scope to optmise
the implementation in bitbake at a later date.

This applies to both this patch and the other one.

Thanks,

Richard


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2 v2] archive-*-source.bbclass: Handle all package classes

2013-01-14 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add archiver tasks correctly for any 'IMAGE_PKGTYPE'.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   15 +--
 meta/classes/archive-original-source.bbclass   |   15 +--
 meta/classes/archive-patched-source.bbclass|   15 +--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 64799e3..50838e6 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
 addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+write_package_task = 'do_package_write_' + packaging
+
+deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -30,6 +37,10 @@ python () {
 recrdeptask += ' do_archive_configured_sources '
 d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
 
+deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_archive_scripts_logs', 'deps', deps)
+
 deps = d.getVarFlag('do_build', 'deps') or []
 deps.append('do_archive_scripts_logs')
 d.setVarFlag('do_build', 'deps', deps)
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 44dffb4..77f9650 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
 addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+write_package_task = 'do_package_write_' + packaging
+
+deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -30,6 +37,10 @@ python () {
 recrdeptask += ' do_archive_original_sources_patches '
 d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
 
+deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_archive_scripts_logs', 'deps', deps)
+
 deps = d.getVarFlag('do_build', 'deps') or []
 deps.append('do_archive_scripts_logs')
 d.setVarFlag('do_build', 'deps', deps)
diff --git a/meta/classes/archive-patched-source.bbclass 
b/meta/classes/archive-patched-source.bbclass
index 35bae54..11dd547 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
 addtask do_archive_patched_sources after do_patch
 
 # Get archiving package with logs(temp) and scripts(.bb and .inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+write_package_task = 'do_package_write_' + packaging
+
+deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -30,6 +37,10 @@ python () {
 recrdeptask += ' do_archive_patched_sources '
 d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
 
+deps = d.getVarFlag('do_archive

[OE-core] [PATCH 1/2 v2] archiver class: Use tasks with sstate instead of pre/post funcs

2013-01-14 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add tasks to move sources, script/logs and diff/env files in
  deploy directory.
* Enable SSTATE for 'do_archive_scripts_logs' task
* Enable SSTATE for 'do_dumpdata_create_diff_gz' task
* SSTATE is not used for sources/patches archiver task because source
  archive package can result into a very large file. It will be an
  unnecessary overhead to keep sources in DL_DIR and cached-binaries.
* If 'SOURCE_ARCHIVE_PACKAGE_TYPE' is 'srpm' then use pre/post functions
  because in this case we do not want to use tasks to move sources/logs
  in DEPLOY_DIR. 'do_package_write_rpm' is responsible for handling
  archiver packages.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   55 ++--
 meta/classes/archive-original-source.bbclass   |   55 ++--
 meta/classes/archive-patched-source.bbclass|   55 ++--
 meta/classes/archiver.bbclass  |   40 -
 4 files changed, 185 insertions(+), 20 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 1eaaf4c..64799e3 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -8,10 +8,59 @@
 inherit archiver
 
 # Get archiving package with configured sources including patches
-do_configure[postfuncs] += "do_archive_configured_sources "
+addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+deps = d.getVarFlag('do_compile', 'deps') or []
+deps.append('do_archive_configured_sources')
+d.setVarFlag('do_compile', 'deps', deps)
+
+recrdeptask = d.getVarFlag('do_build', 'recrdeptask') or []
+recrdeptask += ' do_archive_configured_sources '
+d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
+
+deps = d.getVarFlag('do_build', 'deps') or []
+deps.append('do_archive_scripts_logs')
+d.setVarFlag('do_build', 'deps', deps)
+
+else:
+d.prependVarFlag('do_configure', 'postfuncs', 
"do_archive_configured_sources")
+d.prependVarFlag('do_package_write_rpm', 'prefuncs', 
"do_archive_scripts_logs")
+}
+
+ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
+ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/"
+ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/"
+
+SSTATETASKS += "do_archive_scripts_logs"
+do_archive_scripts_logs[sstate-name] = "archive_scripts_logs"
+do_archive_scripts_logs[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}"
+do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_archive_scripts_logs_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_archive_scripts_logs_setscene
+
+SSTATETASKS += "do_dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}"
+do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_dumpdata_create_diff_gz_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_dumpdata_create_diff_gz_setscene
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 1b3f8d0..44dffb4 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -8,10 +8,59 @@
 inherit archiver
 
 # Get original sources archiving package with patches
-do_unpack[postfuncs] += "do_archive_original_sources_patches "
+addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+original sources and scripts/logs in ${DEPLOY_DIR}/sou

Re: [OE-core] [PATCH 1/3] archive-*-source.bbclass: Use tasks instead of pre/post functions

2013-01-14 Thread Shakeel, Muhammad

All right. I am resending this patch with two commits in total.

--Shakeel

-Original Message-
From: otavio.salva...@gmail.com [mailto:otavio.salva...@gmail.com] On Behalf Of 
Otavio Salvador
Sent: Tuesday, January 08, 2013 9:04 PM
To: Shakeel, Muhammad
Cc: Patches and discussions about the oe-core layer; Larson, Chris
Subject: Re: [OE-core] [PATCH 1/3] archive-*-source.bbclass: Use tasks instead 
of pre/post functions

On Tue, Jan 8, 2013 at 1:55 PM, Shakeel, Muhammad  
wrote:
> From: Muhammad Shakeel 
>
> * Modified following archiver related classes to add separate tasks
>   for different archiver functions instead of adding these as pre/post
>   functions of existing tasks.
> -archive-original-source.bbclass
> -archive-patched-source.bbclass
> -archive-configured-source.bbclass
>
> [YOCTO #3449]
>
> Signed-off-by: Muhammad Shakeel 
> Signed-off-by: Noor Ahsan 
> Signed-off-by: Christopher Larson 

This can be dropped as it will be changed again in 3/3. Right?

--
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854  http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] archive-*-source.bbclass: Handle all package classes

2013-01-08 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add archiver tasks correctly for any 'IMAGE_PKGTYPE'.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   15 +--
 meta/classes/archive-original-source.bbclass   |   15 +--
 meta/classes/archive-patched-source.bbclass|   15 +--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 64799e3..50838e6 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
 addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+write_package_task = 'do_package_write_' + packaging
+
+deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -30,6 +37,10 @@ python () {
 recrdeptask += ' do_archive_configured_sources '
 d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
 
+deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_archive_scripts_logs', 'deps', deps)
+
 deps = d.getVarFlag('do_build', 'deps') or []
 deps.append('do_archive_scripts_logs')
 d.setVarFlag('do_build', 'deps', deps)
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 44dffb4..77f9650 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
 addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+write_package_task = 'do_package_write_' + packaging
+
+deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -30,6 +37,10 @@ python () {
 recrdeptask += ' do_archive_original_sources_patches '
 d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
 
+deps = d.getVarFlag('do_archive_scripts_logs', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_archive_scripts_logs', 'deps', deps)
+
 deps = d.getVarFlag('do_build', 'deps') or []
 deps.append('do_archive_scripts_logs')
 d.setVarFlag('do_build', 'deps', deps)
diff --git a/meta/classes/archive-patched-source.bbclass 
b/meta/classes/archive-patched-source.bbclass
index 35bae54..11dd547 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -11,12 +11,19 @@ inherit archiver
 addtask do_archive_patched_sources after do_patch
 
 # Get archiving package with logs(temp) and scripts(.bb and .inc files)
-addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs
 
 # Get dump date and create diff file 
-addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz before do_build
 
 python () {
+packaging = d.getVar('IMAGE_PKGTYPE', True)
+write_package_task = 'do_package_write_' + packaging
+
+deps = d.getVarFlag('do_dumpdata_create_diff_gz', 'deps') or []
+deps.append(write_package_task)
+d.setVarFlag('do_dumpdata_create_diff_gz', 'deps', deps)
+
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
 """
 If package type is not 'srpm' then add tasks to move archive packages 
of
@@ -30,6 +37,10 @@ python () {
 recrdeptask += ' do_archive_patched_sources '
 d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
 
+deps = d.getVarFlag('do_archive

[OE-core] [PATCH 2/3] archiver class: Make archiver tasks SSTATE aware

2013-01-08 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Enable SSTATE for 'do_archive_scripts_logs' task
* Enable SSTATE for 'do_dumpdata_create_diff_gz' task
* SSTATE is not used for sources/patches archiver task because source
  archive package can result into a very large file. It will be an
  unnecessary overhead to keep sources in DL_DIR and cached-binaries.
* If 'SOURCE_ARCHIVE_PACKAGE_TYPE' is 'srpm' then use pre/post functions
  because in this case we do not want to use tasks to move sources/logs
  in DEPLOY_DIR. 'do_package_write_rpm' is responsible for handling
  archiver packages.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   53 +++-
 meta/classes/archive-original-source.bbclass   |   53 +++-
 meta/classes/archive-patched-source.bbclass|   53 +++-
 meta/classes/archiver.bbclass  |   41 +-
 4 files changed, 183 insertions(+), 17 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index d804e3d..64799e3 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -8,10 +8,59 @@
 inherit archiver
 
 # Get archiving package with configured sources including patches
-addtask do_archive_configured_sources after do_configure before do_compile
+addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package before do_package_write_rpm
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
 addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+deps = d.getVarFlag('do_compile', 'deps') or []
+deps.append('do_archive_configured_sources')
+d.setVarFlag('do_compile', 'deps', deps)
+
+recrdeptask = d.getVarFlag('do_build', 'recrdeptask') or []
+recrdeptask += ' do_archive_configured_sources '
+d.setVarFlag('do_build', 'recrdeptask', recrdeptask)
+
+deps = d.getVarFlag('do_build', 'deps') or []
+deps.append('do_archive_scripts_logs')
+d.setVarFlag('do_build', 'deps', deps)
+
+else:
+d.prependVarFlag('do_configure', 'postfuncs', 
"do_archive_configured_sources")
+d.prependVarFlag('do_package_write_rpm', 'prefuncs', 
"do_archive_scripts_logs")
+}
+
+ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
+ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/"
+ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/"
+
+SSTATETASKS += "do_archive_scripts_logs"
+do_archive_scripts_logs[sstate-name] = "archive_scripts_logs"
+do_archive_scripts_logs[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}"
+do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_archive_scripts_logs_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_archive_scripts_logs_setscene
+
+SSTATETASKS += "do_dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}"
+do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_dumpdata_create_diff_gz_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_dumpdata_create_diff_gz_setscene
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 604d19c..44dffb4 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -8,10 +8,59 @@
 inherit archiver
 
 # Get original sources archiving package with patches
-addtask do_archive_original_sources_patches after do_unpack before do_patch
+addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package before do_package_write_rpm
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
 addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+original sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+deps = d.getVarFlag('do_patch', 'deps') or []
+deps.append('do_archive_original_sources_patches')
+d.setVarFla

[OE-core] [PATCH 1/3] archive-*-source.bbclass: Use tasks instead of pre/post functions

2013-01-08 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Modified following archiver related classes to add separate tasks
  for different archiver functions instead of adding these as pre/post
  functions of existing tasks.
-archive-original-source.bbclass
-archive-patched-source.bbclass
-archive-configured-source.bbclass

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |6 +++---
 meta/classes/archive-original-source.bbclass   |6 +++---
 meta/classes/archive-patched-source.bbclass|6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 1eaaf4c..d804e3d 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -8,10 +8,10 @@
 inherit archiver
 
 # Get archiving package with configured sources including patches
-do_configure[postfuncs] += "do_archive_configured_sources "
+addtask do_archive_configured_sources after do_configure before do_compile
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package before do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 1b3f8d0..604d19c 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -8,10 +8,10 @@
 inherit archiver
 
 # Get original sources archiving package with patches
-do_unpack[postfuncs] += "do_archive_original_sources_patches "
+addtask do_archive_original_sources_patches after do_unpack before do_patch
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package before do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
diff --git a/meta/classes/archive-patched-source.bbclass 
b/meta/classes/archive-patched-source.bbclass
index 40b2dcb..4b0a199 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -8,10 +8,10 @@
 inherit archiver
 
 # Get archiving package with patched sources including patches
-do_patch[postfuncs] += "do_archive_patched_sources "
+addtask do_archive_patched_sources after do_patch before do_configure
 
 # Get archiving package with logs(temp) and scripts(.bb and .inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package before do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 3/3] [RFC] archive-*-source.bbclass: Handle package class 'package_ipk'

2013-01-06 Thread Shakeel, Muhammad

Okay, I will fix it by using python function before sending the final patch. 
Thanks for your feedback.

--Shakeel

-Original Message-
From: openembedded-core-boun...@lists.openembedded.org 
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Otavio 
Salvador
Sent: Friday, January 04, 2013 2:14 AM
To: Larson, Chris
Cc: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 3/3] [RFC] archive-*-source.bbclass: Handle 
package class 'package_ipk'

On Wed, Jan 2, 2013 at 3:11 PM, Christopher Larson  
wrote:
>
>
> On Wed, Jan 2, 2013 at 10:04 AM, Otavio Salvador 
> 
> wrote:
>>
>> On Wed, Jan 2, 2013 at 12:51 PM, Christopher Larson 
>>  wrote:
>> > On Wed, Jan 2, 2013 at 4:53 AM, Shakeel, Muhammad 
>> >  wrote:
>> >>
>> >>  addtask do_archive_scripts_logs after do_package_write_rpm
>> >> +addtask do_archive_scripts_logs after do_package_write_ipk
>> >
>> >
>> > This will cause problems for anyone trying to do builds without 
>> > package_ipk at all. I'd suggest using anonymous python to add the 
>> > appropriate package dependencies based on what tasks actually 
>> > exist.
>>
>> Uh? the only exception for it would be deb, right?
>
>
> Yes, and?

So the first patch changing from pre/post commands should be reworked and solve 
it in the right way. I agree about the use of annonymous python method for it.

--
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854  http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] [RFC] archive-*-source.bbclass: Handle package class 'package_ipk'

2013-01-02 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Add archiver tasks correctly if 'PACKAGE_CLASSES' is set to 'package_ipk'

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |2 ++
 meta/classes/archive-original-source.bbclass   |2 ++
 meta/classes/archive-patched-source.bbclass|2 ++
 3 files changed, 6 insertions(+)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 83ee42e..83a77f3 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -12,9 +12,11 @@ addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
 addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs after do_package_write_ipk
 
 # Get dump date and create diff file 
 addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz after do_package_write_ipk before do_build
 
 python () {
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 53a3539..10003be 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -12,9 +12,11 @@ addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
 addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs after do_package_write_ipk
 
 # Get dump date and create diff file 
 addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz after do_package_write_ipk before do_build
 
 python () {
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
diff --git a/meta/classes/archive-patched-source.bbclass 
b/meta/classes/archive-patched-source.bbclass
index a23f4bf..7c94d25 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -12,9 +12,11 @@ addtask do_archive_patched_sources after do_patch
 
 # Get archiving package with logs(temp) and scripts(.bb and .inc files)
 addtask do_archive_scripts_logs after do_package_write_rpm
+addtask do_archive_scripts_logs after do_package_write_ipk
 
 # Get dump date and create diff file 
 addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+addtask do_dumpdata_create_diff_gz after do_package_write_ipk before do_build
 
 python () {
 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] [RFC] archiver class: Make archiver tasks SSTATE aware

2013-01-02 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Enable SSTATE for 'do_archive_scripts_logs' task
* Enable SSTATE for 'do_dumpdata_create_diff_gz' task
* SSTATE is not used for sources/patches archiver task because source
  archive package can result into a very large file. It will be an
  unnecessary overhead to keep sources in DL_DIR and cached-binaries.
* If 'SOURCE_ARCHIVE_PACKAGE_TYPE' is 'srpm' then use pre/post functions
  because in this case we do not want to move sources/logs in DEPLOY_DIR.

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |   49 +++-
 meta/classes/archive-original-source.bbclass   |   49 +++-
 meta/classes/archive-patched-source.bbclass|   49 +++-
 meta/classes/archiver.bbclass  |   41 ++--
 4 files changed, 171 insertions(+), 17 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index d804e3d..83ee42e 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -8,10 +8,55 @@
 inherit archiver
 
 # Get archiving package with configured sources including patches
-addtask do_archive_configured_sources after do_configure before do_compile
+addtask do_archive_configured_sources after do_configure
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package before do_package_write_rpm
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
 addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+configured sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+deps = d.getVarFlag('do_compile', 'deps') or []
+deps.append('do_archive_configured_sources')
+d.setVarFlag('do_compile', 'deps', deps)
+
+deps = d.getVarFlag('do_build', 'deps') or []
+deps.append('do_archive_scripts_logs')
+d.setVarFlag('do_build', 'deps', deps)
+
+else:
+d.prependVarFlag('do_configure', 'postfuncs', 
"do_archive_configured_sources")
+d.prependVarFlag('do_package_write_rpm', 'prefuncs', 
"do_archive_scripts_logs")
+}
+
+ARCHIVE_SSTATE_OUTDIR = "${DEPLOY_DIR}/sources/"
+ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/"
+ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/"
+
+SSTATETASKS += "do_archive_scripts_logs"
+do_archive_scripts_logs[sstate-name] = "archive_scripts_logs"
+do_archive_scripts_logs[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}"
+do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_archive_scripts_logs_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_archive_scripts_logs_setscene
+
+SSTATETASKS += "do_dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz"
+do_dumpdata_create_diff_gz[sstate-inputdirs] = 
"${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}"
+do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}"
+
+python do_dumpdata_create_diff_gz_setscene () {
+sstate_setscene(d)
+}
+
+addtask do_dumpdata_create_diff_gz_setscene
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 604d19c..53a3539 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -8,10 +8,55 @@
 inherit archiver
 
 # Get original sources archiving package with patches
-addtask do_archive_original_sources_patches after do_unpack before do_patch
+addtask do_archive_original_sources_patches after do_unpack
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-addtask do_archive_scripts_logs after do_package before do_package_write_rpm
+addtask do_archive_scripts_logs after do_package_write_rpm
 
 # Get dump date and create diff file 
 addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
+
+python () {
+if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) != 'srpm':
+"""
+If package type is not 'srpm' then add tasks to move archive packages 
of
+original sources and scripts/logs in ${DEPLOY_DIR}/sources.
+"""
+deps = d.getVarFlag('do_patch', 'deps') or []
+deps.append('do_archive_original_sources_patches')
+d.setVarFlag('do_patch', 'deps', deps)
+
+deps = d.getVarFlag('do_build', 'deps') or []
+deps.append('do_archive_scripts_logs')
+d.setVarFlag('do_build', 'deps', deps)
+
+else:
+d.prependVarFlag('do_unpack', 'postfuncs', 
"do_archive_original_sources_

[OE-core] [PATCH 1/3] [RFC] archive-*-source.bbclass: Use tasks instead of pre/post functions

2013-01-02 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

* Modified following archiver related classes to add separate tasks
  for different archiver functions instead of adding these as pre/post
  functions of existing tasks.
-archive-original-source.bbclass
-archive-patched-source.bbclass
-archive-configured-source.bbclass

[YOCTO #3449]

Signed-off-by: Muhammad Shakeel 
Signed-off-by: Noor Ahsan 
Signed-off-by: Christopher Larson 
---
 meta/classes/archive-configured-source.bbclass |6 +++---
 meta/classes/archive-original-source.bbclass   |6 +++---
 meta/classes/archive-patched-source.bbclass|6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/classes/archive-configured-source.bbclass 
b/meta/classes/archive-configured-source.bbclass
index 1eaaf4c..d804e3d 100644
--- a/meta/classes/archive-configured-source.bbclass
+++ b/meta/classes/archive-configured-source.bbclass
@@ -8,10 +8,10 @@
 inherit archiver
 
 # Get archiving package with configured sources including patches
-do_configure[postfuncs] += "do_archive_configured_sources "
+addtask do_archive_configured_sources after do_configure before do_compile
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package before do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
diff --git a/meta/classes/archive-original-source.bbclass 
b/meta/classes/archive-original-source.bbclass
index 1b3f8d0..604d19c 100644
--- a/meta/classes/archive-original-source.bbclass
+++ b/meta/classes/archive-original-source.bbclass
@@ -8,10 +8,10 @@
 inherit archiver
 
 # Get original sources archiving package with patches
-do_unpack[postfuncs] += "do_archive_original_sources_patches "
+addtask do_archive_original_sources_patches after do_unpack before do_patch
 
 # Get archiving package with temp(logs) and scripts(.bb and inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package before do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
diff --git a/meta/classes/archive-patched-source.bbclass 
b/meta/classes/archive-patched-source.bbclass
index 40b2dcb..4b0a199 100644
--- a/meta/classes/archive-patched-source.bbclass
+++ b/meta/classes/archive-patched-source.bbclass
@@ -8,10 +8,10 @@
 inherit archiver
 
 # Get archiving package with patched sources including patches
-do_patch[postfuncs] += "do_archive_patched_sources "
+addtask do_archive_patched_sources after do_patch before do_configure
 
 # Get archiving package with logs(temp) and scripts(.bb and .inc files)
-do_package_write_rpm[prefuncs] += "do_archive_scripts_logs "
+addtask do_archive_scripts_logs after do_package before do_package_write_rpm
 
 # Get dump date and create diff file 
-do_package_write_rpm[postfuncs] += "do_dumpdata_create_diff_gz "
+addtask do_dumpdata_create_diff_gz after do_package_write_rpm before do_build
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2] wireless-tools: Remove QA warning: No GNU_HASH in the elf binary

2012-12-18 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Handle LDFLAGS properly in the Makefile to remove warning:
QA Issue: No GNU_HASH in the elf binary

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 .../wireless-tools/wireless-tools/ldflags.patch|   22 
 .../wireless-tools/wireless-tools_29.bb|3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git 
a/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch 
b/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
new file mode 100644
index 000..6c0d8cb
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
@@ -0,0 +1,22 @@
+wireless-tools: Remove QA warning: No GNU_HASH in the elf binary
+
+Upstream-Status: Inappropriate [other]
+  Useful within bitbake environment only.
+
+Signed-off-by: Muhammad Shakeel 
+
+---
+ Makefile |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- wireless_tools.29.orig/Makefile
 wireless_tools.29/Makefile
+@@ -144,7 +144,7 @@ wireless.h:
+ 
+ # Compilation of the dynamic library
+ $(DYNAMIC): $(OBJS:.o=.so)
+-  $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
++  $(CC) -shared -o $@ -Wl,-soname,$@ $(LDFLAGS) $(STRIPFLAGS) $(LIBS) -lc 
$^
+ 
+ # Compilation of the static library
+ $(STATIC): $(OBJS:.o=.so)
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb 
b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index 209f29a..b4d34bb 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -14,7 +14,8 @@ SRC_URI = 
"http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.2
   file://man.patch \
   file://wireless-tools.if-pre-up \
   file://zzz-wireless.if-pre-up \
-  file://avoid_strip.patch"
+  file://avoid_strip.patch \
+  file://ldflags.patch"
 
 SRC_URI[md5sum] = "e06c222e186f7cc013fd272d023710cb"
 SRC_URI[sha256sum] = 
"6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1"
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2] libacpi: Remove QA warning: No GNU_HASH in the elf binary

2012-12-12 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Handle LDFLAGS properly in the Makefile to remove warning:
QA Issue: No GNU_HASH in the elf binary

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-bsp/libacpi/files/ldflags.patch |   41 ++
 meta/recipes-bsp/libacpi/libacpi_0.2.bb  |3 +-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/libacpi/files/ldflags.patch 
b/meta/recipes-bsp/libacpi/files/ldflags.patch
new file mode 100644
index 000..a7424c3
--- /dev/null
+++ b/meta/recipes-bsp/libacpi/files/ldflags.patch
@@ -0,0 +1,41 @@
+libacpi: Remove QA warning: No GNU_HASH in the elf binary
+
+Upstream-Status: Inappropriate [other]
+  Useful within bitbake environment only.
+
+Signed-off-by: Muhammad Shakeel 
+
+---
+ Makefile  |3 ++-
+ config.mk |1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- libacpi-0.2.orig/Makefile
 libacpi-0.2/Makefile
+@@ -19,6 +19,7 @@ options:
+   @echo "CFLAGS   = ${CFLAGS}"
+   @echo "CC   = ${CC}"
+   @echo "SOFLAGS  = ${SOFLAGS}"
++  @echo "LDFLAGS  = ${LDFLAGS}"
+   @echo "LD   = ${LD}"
+ 
+ .c.o:
+@@ -34,7 +35,7 @@ libacpi.a: ${OBJ}
+ 
+ libacpi.so: ${OBJ}
+   @echo LD $@
+-  @${CC} ${SOFLAGS} -o $@.${SOVERSION} ${OBJ}
++  @${CC} ${SOFLAGS} ${LDFLAGS} -o $@.${SOVERSION} ${OBJ}
+ 
+ test-libacpi: ${OBJ_test}
+   @echo LD $@
+--- libacpi-0.2.orig/config.mk
 libacpi-0.2/config.mk
+@@ -10,6 +10,7 @@ MANPREFIX = ${PREFIX}/share/man
+ SOFLAGS = -shared -Wl,-soname,${SONAME}
+ CFLAGS += -fPIC -g --pedantic -Wall -Wextra
+ ARFLAGS = cr
++LDFLAGS =
+ 
+ # Compiler and linker
+ CC = cc
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb 
b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index b0fbf0b..f4c323d 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -10,7 +10,8 @@ PR = "r6"
 SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
   file://makefile-fix.patch \
   file://libacpi_fix_for_x32.patch \
-  file://use_correct_strip_in_cross_environment.patch"
+  file://use_correct_strip_in_cross_environment.patch \
+  file://ldflags.patch "
 
 SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
 SRC_URI[sha256sum] = 
"13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] wireless-tools: Remove QA warning: No GNU_HASH in the elf binary

2012-12-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Handle LDFLAGS properly in the Makefile to remove warning:
QA Issue: No GNU_HASH in the elf binary

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 .../wireless-tools/wireless-tools/ldflags.patch|   15 +++
 .../wireless-tools/wireless-tools_29.bb|3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch 
b/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
new file mode 100644
index 000..84144ac
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
@@ -0,0 +1,15 @@
+---
+ Makefile |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- wireless_tools.29.orig/Makefile
 wireless_tools.29/Makefile
+@@ -144,7 +144,7 @@ wireless.h:
+ 
+ # Compilation of the dynamic library
+ $(DYNAMIC): $(OBJS:.o=.so)
+-  $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
++  $(CC) -shared -o $@ -Wl,-soname,$@ $(LDFLAGS) $(STRIPFLAGS) $(LIBS) -lc 
$^
+ 
+ # Compilation of the static library
+ $(STATIC): $(OBJS:.o=.so)
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb 
b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index 209f29a..b4d34bb 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -14,7 +14,8 @@ SRC_URI = 
"http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.2
   file://man.patch \
   file://wireless-tools.if-pre-up \
   file://zzz-wireless.if-pre-up \
-  file://avoid_strip.patch"
+  file://avoid_strip.patch \
+  file://ldflags.patch"
 
 SRC_URI[md5sum] = "e06c222e186f7cc013fd272d023710cb"
 SRC_URI[sha256sum] = 
"6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1"
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libacpi: Remove QA warning: No GNU_HASH in the elf binary

2012-12-11 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Handle LDFLAGS properly in the Makefile to remove warning:
QA Issue: No GNU_HASH in the elf binary

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-bsp/libacpi/files/ldflags.patch |   34 ++
 meta/recipes-bsp/libacpi/libacpi_0.2.bb  |3 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/libacpi/files/ldflags.patch 
b/meta/recipes-bsp/libacpi/files/ldflags.patch
new file mode 100644
index 000..8049aa8
--- /dev/null
+++ b/meta/recipes-bsp/libacpi/files/ldflags.patch
@@ -0,0 +1,34 @@
+---
+ Makefile  |3 ++-
+ config.mk |1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- libacpi-0.2.orig/Makefile
 libacpi-0.2/Makefile
+@@ -19,6 +19,7 @@ options:
+   @echo "CFLAGS   = ${CFLAGS}"
+   @echo "CC   = ${CC}"
+   @echo "SOFLAGS  = ${SOFLAGS}"
++  @echo "LDFLAGS  = ${LDFLAGS}"
+   @echo "LD   = ${LD}"
+ 
+ .c.o:
+@@ -34,7 +35,7 @@ libacpi.a: ${OBJ}
+ 
+ libacpi.so: ${OBJ}
+   @echo LD $@
+-  @${CC} ${SOFLAGS} -o $@.${SOVERSION} ${OBJ}
++  @${CC} ${SOFLAGS} ${LDFLAGS} -o $@.${SOVERSION} ${OBJ}
+ 
+ test-libacpi: ${OBJ_test}
+   @echo LD $@
+--- libacpi-0.2.orig/config.mk
 libacpi-0.2/config.mk
+@@ -10,6 +10,7 @@ MANPREFIX = ${PREFIX}/share/man
+ SOFLAGS = -shared -Wl,-soname,${SONAME}
+ CFLAGS += -fPIC -g --pedantic -Wall -Wextra
+ ARFLAGS = cr
++LDFLAGS =
+ 
+ # Compiler and linker
+ CC = cc
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb 
b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index b0fbf0b..f4c323d 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -10,7 +10,8 @@ PR = "r6"
 SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
   file://makefile-fix.patch \
   file://libacpi_fix_for_x32.patch \
-  file://use_correct_strip_in_cross_environment.patch"
+  file://use_correct_strip_in_cross_environment.patch \
+  file://ldflags.patch "
 
 SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
 SRC_URI[sha256sum] = 
"13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] zip: Remove QA warnings: No GNU_HASH in the elf binary

2012-12-05 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Update the LFLAGS1 in the Makefile to remove warnings:
QA Issue: No GNU_HASH in the elf binary

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/zip/zip.inc |2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/zip/zip.inc 
b/meta/recipes-extended/zip/zip.inc
index a3bbc93..265d9a8 100644
--- a/meta/recipes-extended/zip/zip.inc
+++ b/meta/recipes-extended/zip/zip.inc
@@ -12,6 +12,8 @@ EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 
'CPP=${CPP}' \
'BINFLAGS=0755' 'INSTALL_D=install -d'"
 
 do_compile() {
+   oe_runmake -f unix/Makefile flags
+   sed -i 's#LFLAGS1=""#LFLAGS1="${LDFLAGS}"#' flags
oe_runmake -f unix/Makefile generic
 }
 
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] udev 182: Create a symlink of /lib/udev/udevd in /sbin

2012-12-05 Thread Shakeel, Muhammad

Hi Chen Qi,

Seems like baselib is getting value from here:
baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 
'INVALID'), True) or 'lib'}"

In your conf file, tune-mips64.inc requires arch-mips.inc which sets:

DEFAULTTUNE ?= "mips"
and then:
BASE_LIB_tune-mips = "lib"

This seems to be the reason that why you get /lib in 'baselib' even for mips64 
arch.

I have a modified conf file which sets 'DEFAULTTUNE" to 'mips64'  explicitly.

DEFAULTTUNE="mips64"

And arch-mips.inc has:
BASE_LIB_tune-mips64 = "lib64"

I am sure if you modify DEFAULTTUNE in your conf file then you will get /lib64 
in baselib.

(Sorry for replying late as I forgot to flag this conversation.)

Regards,
Shakeel

-Original Message-
From: ChenQi [mailto:qi.c...@windriver.com] 
Sent: Friday, November 30, 2012 11:01 AM
To: Shakeel, Muhammad
Cc: openembedded-core@lists.openembedded.org; Otavio Salvador
Subject: Re: [OE-core] [PATCH] udev 182: Create a symlink of /lib/udev/udevd in 
/sbin

On 11/28/2012 07:09 PM, Shakeel, Muhammad wrote:
> If we ensure that udev will always be found in /lib/udev/udevd then this 
> patch will not be required.
>
> Actually I needed this patch to start udev on a mips64 target where 
> ${base_libdir} is '/lib64' and original udev init script was failing to start 
> udev.
> (I am not using initramfs).
>
> --Shakeel
Hi Muhammad,

I'm somewhat confused by this 'baselib' problem. I just built udev on a test 
machine which has mips64 arch. But it turned out that its baselib was '/lib' 
instead of '/lib64'.

How did you get '/lib64' on a mips64 target?

My test machine's conf file is:
"
require conf/machine/include/tune-mips64.inc

KERNEL_IMAGETYPE = "vmlinux"
KERNEL_ALT_IMAGETYPE = "vmlinux.bin"

SERIAL_CONSOLE = "115200 ttyS0"

MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
"

Besides, I tried it on x86-64.  As long as we don't explicitly specify multilib 
(lib64) for udev, it defaults to '/lib'.

I seems that the baselib defaults to '/lib64' only when the target has
powerpc64 arch.

Could you please give me some more information to help me?

Thanks,
Chen Qi

> -Original Message-
> From: otavio.salva...@gmail.com [mailto:otavio.salva...@gmail.com] On 
> Behalf Of Otavio Salvador
> Sent: Wednesday, November 28, 2012 3:52 PM
> To: ChenQi
> Cc: Shakeel, Muhammad; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] udev 182: Create a symlink of 
> /lib/udev/udevd in /sbin
>
> On Wed, Nov 28, 2012 at 12:26 AM, ChenQi  wrote:
>> On 11/27/2012 10:15 PM, Otavio Salvador wrote:
>>> On Tue, Nov 27, 2012 at 10:57 AM, Shakeel, Muhammad
>>>wrote:
>>>> From: Muhammad Shakeel
>>>>
>>>>From udev 174 changelog:
>>>> "The udev daemon moved to /lib/udev/udevd. Non-systemd init systems 
>>>> and non-dracut initramfs image generators need to change the init 
>>>> scripts. Alternatively the udev build needs to move udevd back to 
>>>> /sbin or create a symlink in /sbin, which is not done by default."
>>>>
>>>> Also for 64 bit architectures there exists /lib64/udev instead of 
>>>> /lib/udev and current init script fails to start udev.
>>>>
>>>> Signed-off-by: Muhammad Shakeel
>>> As far as I know, all code in master now handles it properly (the 
>>> missing bits I sent a patch today) so why to include this symlink?
>>>
>> I'm not sure about this.
>>
>> Two things:
>>
>> 1) Have we ever tested udev on a target where its ${base_libdir} is 
>> '/lib64'?
>> Apparently, if udevd is intalled under '/lib64', its init script 
>> cannot start udev correctly.
>>
>> 2) Bug#2804 is related to to udev and ${base_libdir}.
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2804
>> (Some packages hardcode their udev rules directory to be 
>> '/lib/udev/rules.d/'. So can udev find them if the ${base_libdir} is 
>> '/lib64'? )
> It seems the right fix for it is to ensure udev is always installed in 
> /lib/udev/udevd (for all targets) as you propose to do for the rules.d 
> directory.
>


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libaio: Remove QA warning: No GNU_HASH in the elf binary

2012-12-05 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Update the LINK_FLAGS in the Makefile to remove warning:
QA Issue: No GNU_HASH in the elf binary

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-extended/libaio/libaio_0.3.109.bb |4 
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-extended/libaio/libaio_0.3.109.bb 
b/meta/recipes-extended/libaio/libaio_0.3.109.bb
index 161b712..0712d04 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.109.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.109.bb
@@ -18,6 +18,10 @@ SRC_URI[sha256sum] = 
"bf4a457253cbaab215aea75cb6e18dc8d95bbd507e9920661ff9bdd288
 
 EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"
 
+do_configure () {
+sed -i 's#LINK_FLAGS=.*#LINK_FLAGS=$(LDFLAGS)#' src/Makefile
+}
+
 do_install () {
 oe_runmake install DESTDIR=${D}
 }
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] qa.py: Toolchain path should not be hardcoded to execute objdump

2012-12-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Currently objdump command is invoked from the STAGING_BINDIR_TOOLCHAIN
directory. In case of external toolchain if this directory doesn't
exist then objdump fails to execute. Instead of hardcoding the path
it should search PATH to find it.

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 meta/lib/oe/qa.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index 2c51141..d9848c8 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -97,14 +97,14 @@ class ELFFile:
 return self.objdump_output[cmd]
 
 objdump = d.getVar('OBJDUMP', True)
-staging_dir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
 
 env = os.environ.copy()
 env["LC_ALL"] = "C"
+env["PATH"] = d.getVar('PATH', True)
 
 try:
 bb.note("%s %s %s" % (objdump, cmd, self.name))
-self.objdump_output[cmd] = bb.process.run([ 
os.path.join(staging_dir, objdump), cmd, self.name ], env=env, shell=False)[0]
+self.objdump_output[cmd] = bb.process.run([objdump, cmd, 
self.name], env=env, shell=False)[0]
 return self.objdump_output[cmd]
 except Exception, e:
 bb.note("%s %s %s failed: %s" % (objdump, cmd, self.name, e))
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] qa.py: Modify the env for the child process only

2012-12-04 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

Modified environment is only required for new subprocess to execute
objdump command and not for the current process. We should only
modify the copy of env to pass it on to the child.

Signed-off-by: Christopher Larson 
Signed-off-by: Muhammad Shakeel 
---
 meta/lib/oe/qa.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index 12dcd1f..2c51141 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -99,7 +99,7 @@ class ELFFile:
 objdump = d.getVar('OBJDUMP', True)
 staging_dir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
 
-env = os.environ
+env = os.environ.copy()
 env["LC_ALL"] = "C"
 
 try:
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] udev 182: Create a symlink of /lib/udev/udevd in /sbin

2012-11-28 Thread Shakeel, Muhammad

If we ensure that udev will always be found in /lib/udev/udevd then this patch 
will not be required.

Actually I needed this patch to start udev on a mips64 target where 
${base_libdir} is '/lib64' and original udev init script was failing to start 
udev.
(I am not using initramfs).

--Shakeel

-Original Message-
From: otavio.salva...@gmail.com [mailto:otavio.salva...@gmail.com] On Behalf Of 
Otavio Salvador
Sent: Wednesday, November 28, 2012 3:52 PM
To: ChenQi
Cc: Shakeel, Muhammad; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] udev 182: Create a symlink of /lib/udev/udevd in 
/sbin

On Wed, Nov 28, 2012 at 12:26 AM, ChenQi  wrote:
> On 11/27/2012 10:15 PM, Otavio Salvador wrote:
>>
>> On Tue, Nov 27, 2012 at 10:57 AM, Shakeel, Muhammad 
>>   wrote:
>>>
>>> From: Muhammad Shakeel
>>>
>>>  From udev 174 changelog:
>>> "The udev daemon moved to /lib/udev/udevd. Non-systemd init systems 
>>> and non-dracut initramfs image generators need to change the init 
>>> scripts. Alternatively the udev build needs to move udevd back to 
>>> /sbin or create a symlink in /sbin, which is not done by default."
>>>
>>> Also for 64 bit architectures there exists /lib64/udev instead of 
>>> /lib/udev and current init script fails to start udev.
>>>
>>> Signed-off-by: Muhammad Shakeel
>>
>> As far as I know, all code in master now handles it properly (the 
>> missing bits I sent a patch today) so why to include this symlink?
>>
> I'm not sure about this.
>
> Two things:
>
> 1) Have we ever tested udev on a target where its ${base_libdir} is 
> '/lib64'?
> Apparently, if udevd is intalled under '/lib64', its init script 
> cannot start udev correctly.
>
> 2) Bug#2804 is related to to udev and ${base_libdir}.
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2804
> (Some packages hardcode their udev rules directory to be 
> '/lib/udev/rules.d/'. So can udev find them if the ${base_libdir} is 
> '/lib64'? )

It seems the right fix for it is to ensure udev is always installed in 
/lib/udev/udevd (for all targets) as you propose to do for the rules.d 
directory.

-- 
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854  http://projetos.ossystems.com.br

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[OE-core] [PATCH] udev 182: Create a symlink of /lib/udev/udevd in /sbin

2012-11-27 Thread Shakeel, Muhammad

From: Muhammad Shakeel 

>From udev 174 changelog:
"The udev daemon moved to /lib/udev/udevd. Non-systemd init systems
and non-dracut initramfs image generators need to change the init
scripts. Alternatively the udev build needs to move udevd back to
/sbin or create a symlink in /sbin, which is not done by default."

Also for 64 bit architectures there exists /lib64/udev instead of
/lib/udev and current init script fails to start udev.

Signed-off-by: Muhammad Shakeel 
---
 meta/recipes-core/udev/udev.inc|4 
 meta/recipes-core/udev/udev/init   |4 ++--
 meta/recipes-core/udev/udev_182.bb |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 4705b9b..a882efe 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -96,5 +96,9 @@ do_install_append () {
# hid2hci has moved to bluez4. removed in udev as of version 169
rm -f ${D}${base_libdir}/udev/hid2hci
 
+# Create a symlink of /lib/udev/udevd in /sbin
+install -d ${D}${base_sbindir}
+ln -s ..${base_libdir}/udev/udevd ${D}${base_sbindir}/udevd
+
echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
 }
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index 74449fe..84631ac 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -13,7 +13,7 @@ export TZ=/etc/localtime
 
 [ -d /sys/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
-[ -x /lib/udev/udevd ] || exit 1
+[ -x /sbin/udevd ] || exit 1
 [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
 [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 
@@ -69,7 +69,7 @@ kill_udevd > "/dev/null" 2>&1
 
 # trigger the sorted events
 echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-/lib/udev/udevd -d
+/sbin/udevd -d
 
 /usr/bin/udevadm control --env=STARTUP=1
 if [ "$not_first_boot" != "" ];then
diff --git a/meta/recipes-core/udev/udev_182.bb 
b/meta/recipes-core/udev/udev_182.bb
index c41de9f..0ae9f8c 100644
--- a/meta/recipes-core/udev/udev_182.bb
+++ b/meta/recipes-core/udev/udev_182.bb
@@ -1,6 +1,6 @@
 include udev.inc
 
-PR = "r2"
+PR = "r3"
 
 # module-init-tools from kmod_git will provide libkmod runtime
 DEPENDS += "module-init-tools"
-- 
1.7.9.5


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

92 matches

Mail list logo