Re: [oe] [meta-oe][v2] 00/22] systemd rework
On Mon, Feb 20, 2012 at 1:40 PM, Martin Jansa martin.ja...@gmail.com wrote:
On Thu, Feb 16, 2012 at 03:02:54AM +0100, Andreas Müller wrote:
V1 - V2:
[2] do not check configuration variables for cross and nativesdk
[3] rename systemd_package to systemd_generate_package_scripts
[6] parse unit files to determine the files to pack
[7] create warning if *-systemd package already rdepends
it's base package
added in V2:
[8]-[20] remove obsolet systemd code from recipes (these were used as
test cases)
[21] dhcp-(relay) test case for multiple systemd packages
[22] modified to start service
The following tests were performed:
* build from scratch with [1]-[7] / run test
* build from scratch / apply patches / build - check buildhistory diff
* build from scratch w/o patches / build from scratch with patches - check
buildhistory diff
Additional patches were prepared for other recipes inheriting systemd. These
are
not yet send because they move systemd support from ${PN} to ${PN}-systemd
which
currently needs modifications on tasks/images. I'd be happy if a common
accepted
solution would be suggested/implemented (image-feature?).
Today I've noticed one more issue (not sure if it's caused by this
patchset or not).
Some images are failing for me with:
For package xserver-nodm-init-systemd SYSTEMD_SERVICE-entry
xserver-nodm.service does not exist
from systemd.bbclass:populate_packages_prepend
I guess it's because sstate package:
sstate-xserver-nodm-init-all-oe-linux-2.0-r13-all-2-2ac030a94ddbd202f54b99c2e32c6312_package.tgz
has only
package/lib/systemd/system/xserver-nodm.service
but systemd.bbclass:populate_packages_prepend is looking only in ${D}
(image directory).
I prepared V3 and up to now all tests look good. Regarding this issue:
What is a test case to reproduce if the modification are OK?
Andreas
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] ELC Videos
Hi, ELC videos are available here : http://video.linux.com/categories/2012-embedded-linux-conference 2 (at least) are about OE Yocto : Khem OpenEmbedded - A Layered Approach : http://video.linux.com/videos/openembedded-a-layered-approach Saul Yocto Project Update : http://video.linux.com/videos/yocto-project-update Eric -- http://eukrea.com/en/news/104-2012 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][v2] 00/22] systemd rework
On Thu, Feb 23, 2012 at 09:26:50AM +0100, Andreas Müller wrote:
On Mon, Feb 20, 2012 at 1:40 PM, Martin Jansa martin.ja...@gmail.com wrote:
On Thu, Feb 16, 2012 at 03:02:54AM +0100, Andreas Müller wrote:
V1 - V2:
[2] do not check configuration variables for cross and nativesdk
[3] rename systemd_package to systemd_generate_package_scripts
[6] parse unit files to determine the files to pack
[7] create warning if *-systemd package already rdepends
it's base package
added in V2:
[8]-[20] remove obsolet systemd code from recipes (these were used as
test cases)
[21] dhcp-(relay) test case for multiple systemd packages
[22] modified to start service
The following tests were performed:
* build from scratch with [1]-[7] / run test
* build from scratch / apply patches / build - check buildhistory diff
* build from scratch w/o patches / build from scratch with patches - check
buildhistory diff
Additional patches were prepared for other recipes inheriting systemd.
These are
not yet send because they move systemd support from ${PN} to ${PN}-systemd
which
currently needs modifications on tasks/images. I'd be happy if a common
accepted
solution would be suggested/implemented (image-feature?).
Today I've noticed one more issue (not sure if it's caused by this
patchset or not).
Some images are failing for me with:
For package xserver-nodm-init-systemd SYSTEMD_SERVICE-entry
xserver-nodm.service does not exist
from systemd.bbclass:populate_packages_prepend
I guess it's because sstate package:
sstate-xserver-nodm-init-all-oe-linux-2.0-r13-all-2-2ac030a94ddbd202f54b99c2e32c6312_package.tgz
has only
package/lib/systemd/system/xserver-nodm.service
but systemd.bbclass:populate_packages_prepend is looking only in ${D}
(image directory).
I prepared V3 and up to now all tests look good. Regarding this issue:
Great!
What is a test case to reproduce if the modification are OK?
With clean tmpdir (and without rmwork) build xserver-nodm to populate
sstate-cache, then delete tmpdir and build it again. If it reuses .ipk
directly from sstate deploy-ipk.tgz, then it's a bit harder and you have
to change checksum of some runtime dependency (so that do_package_write is
reexecuted after unpacking package.tgz from sstate) this is usually
triggered by change of MACHINE.
But if you don't manage to reproduce it then we can fix this in
followup..
Cheers,
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-handheld][PATCH] linux_3.2: update from 3.2.1 to 3.2.7
On Thu, Feb 23, 2012 at 7:36 AM, Martin Jansa martin.ja...@gmail.com wrote:
On Wed, Feb 22, 2012 at 11:28:08PM +0100, Andrea Adami wrote:
* apply latest patchset
* bump INC_PR
Looking at this commit and almost the same in meta-initramfs, why
haven't you moved linux-3.2.inc to meta-initramfs and use that from
meta-handheld as it already depends on meta-initramfs layer for
kexecboot?
Cheers,
Martin,
I even plan to merge the linux-3.1.inc, linux-3.2.inc and
linux-git.inc in the respective recipes...
I prefer to keep the two kernels clearly separated for several reasons:
- people can be interested in meta-initramfs only and it's much more
clear having a single file and one .inc
(they would find this second .inc pointless)
- there is little need to match linux and linux-kexecboot 3.x versions
- I plan to test linux-yocto, maybe only for linux-kexecboot at the
beginning so the recipes will diverge
- Imho we have already too many kernel recipes and files in meta-initramfs
Regards
Andrea
---
recipes-kernel/linux/linux-3.2.inc | 6 +++---
recipes-kernel/linux/linux_3.2.bb | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes-kernel/linux/linux-3.2.inc
b/recipes-kernel/linux/linux-3.2.inc
index 8dd30d9..3a37200 100644
--- a/recipes-kernel/linux/linux-3.2.inc
+++ b/recipes-kernel/linux/linux-3.2.inc
@@ -3,12 +3,12 @@ DEFAULT_PREFERENCE = -1
COMPATIBLE_MACHINE = (spitz)
SRC_URI +=
${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.1.bz2;apply=yes;name=stablepatch
\
+
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch
\
file://defconfig \
file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
SRC_URI[kernel.md5sum] = 7ceb61f87c097fc17509844b71268935
SRC_URI[kernel.sha256sum] =
c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
-SRC_URI[stablepatch.md5sum] = 31fc34340f8873463a1d59d47b7f
-SRC_URI[stablepatch.sha256sum] =
e9a26dc5faa309ae5172e3c65081fa98b60befab160fb14d9a75816bbde15626
+SRC_URI[stablepatch.md5sum] = 899624bffed6a19578613b672cc9483f
+SRC_URI[stablepatch.sha256sum] =
779c548f4418f0baa782252d15a54fadf3c88d79fc547ee5801d31798020e701
diff --git a/recipes-kernel/linux/linux_3.2.bb
b/recipes-kernel/linux/linux_3.2.bb
index 28564b6..6c15a88 100644
--- a/recipes-kernel/linux/linux_3.2.bb
+++ b/recipes-kernel/linux/linux_3.2.bb
@@ -1,4 +1,4 @@
require linux.inc
require linux-${PV}.inc
-PR = ${INC_PR}.0
+PR = ${INC_PR}.1
--
1.7.3.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] gcc-cross-initial patching fails
On Wed, Feb 22, 2012 at 10:39 PM, Andreas Müller schnitzelt...@googlemail.com wrote: On Wed, Feb 22, 2012 at 10:18 PM, Khem Raj raj.k...@gmail.com wrote: On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882 b29...@freescale.com wrote: Applying patch gcc45-no-add-needed.patch patching file gcc/config/alpha/elf.h patching file gcc/config/ia64/linux.h patching file gcc/config/linux.h Hunk #1 succeeded at 89 (offset -12 lines). patching file gcc/config/rs6000/sysv4.h Hunk #1 FAILED at 908. 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h Patch gcc45-no-add-needed.patch does not apply (enforce with -f) ERROR: Function failed: patch_do_patch ERROR: Logfile of failure stored in: /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367 NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed ERROR: Task 2829 (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb, do_patch) failed with exit code '1' git log does not help me much - what goes wrong? Which actual patch is it failing on? Is there a conflict between oe-core and meta-oe patch set against gcc? gcc45-no-add-needed.patch is the patch in question. I dont see anything wrong with it. Can you do bitbake -ccleanall gcc-cross-initial and redo bitbake gcc-cross-initial -cpatch ? FYI: I removed the line which came in by the commits I mentioned above should_apply[vardepsexclude] += PN in openembedded-core/meta/recipes-devtools/gcc/gcc-common.inc and build from scratch works without issues. Strange: On my other build machine the described error does not occur... Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 05/23] systemd.bbclass: automatically create packages set in SYSTEMD_PACKAGES
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
meta-oe/classes/systemd.bbclass |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 6517357..e779bef 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -63,8 +63,17 @@ def systemd_after_parse(d):
if systemd_services == :
raise bb.build.FuncFailed, \n\n%s
inherits systemd but doesn't set SYSTEMD_SERVICE / %s % (bb_filename,
service_pkg)
+ # prepend systemd-packages not already included
+ def systemd_create_package(pkg_systemd):
+ packages = d.getVar('PACKAGES', 1)
+ if not pkg_systemd in packages:
+ packages = %s %s % (pkg_systemd, packages)
+ d.setVar('PACKAGES', packages)
+
systemd_check_vars()
+ for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
+ systemd_create_package(pkg_systemd)
python __anonymous() {
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 07/23] systemd.bbclass: run code in populate_packages_prepend only if ${D} exists
All further manipulations need to be performed only once. This modication
avoids unwanted behaviour when inheriting rm_work.bbclass [1]
[1]
http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-February/038067.html
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/classes/systemd.bbclass |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index b2d4191..e13f09d 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -127,6 +127,8 @@ python populate_packages_prepend () {
bb.data.setVar('RDEPENDS_' + pkg, + .join(rdepends), d)
- for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
- systemd_generate_package_scripts(pkg_systemd)
+ # run all modifications once when creating package
+ if os.path.exists('${D}'):
+ for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
+ systemd_generate_package_scripts(pkg_systemd)
}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 06/23] systemd.bbclass: automatically install all *.service and *.socket supplied in recipe's SRC_URI
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/classes/systemd.bbclass | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index e779bef..b2d4191 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -80,6 +80,17 @@ python __anonymous() {
systemd_after_parse(d)
}
+# automatically install all *.service and *.socket supplied in recipe's SRC_URI
+do_install_append() {
+install -d ${D}${systemd_unitdir}/system
+for service in `find ${WORKDIR} -maxdepth 1 -name '*.service' -o -name
'*.socket'` ; do
+ # ensure installing systemd-files only (e.g not avahi *.service)
+ if grep -q '\[Unit\]' $service ; then
+ install -m 644 $service ${D}${systemd_unitdir}/system
+ fi
+done
+}
+
python populate_packages_prepend () {
def systemd_generate_package_scripts(pkg):
bb.debug(1, 'adding systemd calls to postinst/postrm for %s' %
pkg)
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 11/23] dropbear: remove unneeded systemd code / use ${systemd_unitdir}
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../dropbear/dropbear_2011.54.bbappend | 13 ++---
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
index 899e1fc..fc5d047 100644
--- a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
+++ b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
@@ -1,6 +1,6 @@
inherit systemd
-PRINC := ${@int(PRINC) + 1}
+PRINC := ${@int(PRINC) + 2}
# look for files in the layer first
FILESEXTRAPATHS := ${THISDIR}/${PN}
@@ -13,14 +13,5 @@ SYSTEMD_PACKAGES = ${PN}-systemd
SYSTEMD_SERVICE_${PN}-systemd = dropbear.socket
do_install_append() {
- install -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/dropbearkey.service
${D}${base_libdir}/systemd/system/
- install -m 0644 ${WORKDIR}/dropbear@.service
${D}${base_libdir}/systemd/system/
- install -m 0644 ${WORKDIR}/dropbear.socket
${D}${base_libdir}/systemd/system/
- ln -sf /dev/null ${D}${base_libdir}/systemd/system/dropbear.service
+ ln -sf /dev/null ${D}${systemd_unitdir}/system/dropbear.service
}
-
-PACKAGES += ${PN}-systemd
-
-RDEPENDS_${PN}-systemd += dropbear
-FILES_${PN}-systemd = ${base_libdir}/systemd
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 14/23] cronie: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
.../recipes-extended/cronie/cronie_1.4.8.bbappend | 12 +---
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
b/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
index e0b9fb9..5aedb21 100644
--- a/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
+++ b/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
@@ -1,7 +1,7 @@
# look for files in the layer first
FILESEXTRAPATHS := ${THISDIR}/${PN}
-PRINC = 1
+PRINC = 2
inherit systemd
@@ -9,13 +9,3 @@ SYSTEMD_PACKAGES = ${PN}-systemd
SYSTEMD_SERVICE_${PN}-systemd = crond.service
SRC_URI += file://crond.service
-
-do_install_append() {
-install -d ${D}${base_libdir}/systemd/system
-install -m 644 ${WORKDIR}/crond.service ${D}${base_libdir}/systemd/system
-}
-
-PACKAGES =+ ${PN}-systemd
-
-FILES_${PN}-systemd += ${base_libdir}/systemd
-RDEPENDS_${PN}-systemd = ${PN}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 10/23] connman: remove unneeded systemd code / use ${systemd_unitdir}
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../connman/connman_0.78.bbappend |9 ++---
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta-oe/recipes-connectivity/connman/connman_0.78.bbappend
b/meta-oe/recipes-connectivity/connman/connman_0.78.bbappend
index d6f756c..f1b05aa 100644
--- a/meta-oe/recipes-connectivity/connman/connman_0.78.bbappend
+++ b/meta-oe/recipes-connectivity/connman/connman_0.78.bbappend
@@ -1,13 +1,8 @@
inherit systemd
-EXTRA_OECONF += --with-systemdunitdir=${base_libdir}/systemd/system/
+EXTRA_OECONF += --with-systemdunitdir=${systemd_unitdir}/system/
-PRINC := ${@int(PRINC) + 1}
+PRINC := ${@int(PRINC) + 2}
SYSTEMD_PACKAGES = ${PN}-systemd
SYSTEMD_SERVICE_${PN}-systemd = connman.service
-
-# systemd files
-PACKAGES =+ ${PN}-systemd
-FILES_${PN}-systemd += ${base_libdir}/systemd
-RDEPENDS_${PN}-systemd += ${PN}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 08/23] systemd.bbclass: automatically extend FILES_* for systemd packages
* Add files found in SYSTEMD_SERVICE and add service files referenced by 'Also='
(and 'Conflicts=' in case of one service for links to /dev/null) recursively.
* For *.socket files the corresponding '*.service' and '*@.service are packed
* In case a file set in SYSTEMD_SERVICE does not exist, build is aborted with an
error message.
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/classes/systemd.bbclass | 60 +++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index e13f09d..c712e17 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -126,9 +126,69 @@ python populate_packages_prepend () {
rdepends.append(systemd)
bb.data.setVar('RDEPENDS_' + pkg, + .join(rdepends), d)
+ # add files to FILES_*-systemd if existent and not already done
+ def systemd_append_file(pkg_systemd, file_append):
+ appended = False
+ if os.path.exists('${D}' + file_append):
+ var_name = FILES_ + pkg_systemd
+ files = d.getVar(var_name, 0) or
+ if file_append not in files.split():
+ d.setVar(var_name, %s %s % (files,
file_append))
+ appended = True
+ return appended
+
+ # add systemd files to FILES_*-systemd, parse for Also= and follow
recursive
+ def systemd_add_files_and_parse(pkg_systemd, path, service, keys):
+ # avoid infinite recursion
+ if systemd_append_file(pkg_systemd, path + service):
+ fullpath = '${D}' + path + service
+ if service.find('.socket') != -1:
+ # for *.socket add *.service and *@.service
+ service_base = service.replace('.socket', '')
+ systemd_add_files_and_parse(pkg_systemd, path,
service_base + '.service', keys)
+ systemd_add_files_and_parse(pkg_systemd, path,
service_base + '@.service', keys)
+ for key in keys.split():
+ # recurse all dependencies found in keys
('Also';'Conflicts';..) and add to files
+ cmd = grep %s %s | sed 's,%s=,,g' | tr ','
'\\n' % (key, fullpath, key)
+ pipe = os.popen(cmd, 'r')
+ line = pipe.readline()
+ while line:
+ line = line.replace('\n', '')
+
systemd_add_files_and_parse(pkg_systemd, path, line, keys)
+ line = pipe.readline()
+ pipe.close()
+
+ # check service-files and call systemd_add_files_and_parse for each
entry
+ def systemd_check_services():
+ searchpaths = '/etc/systemd/system/ /lib/systemd/system/
/usr/lib/systemd/system/'
+ systemd_packages = d.getVar('SYSTEMD_PACKAGES', 1)
+ has_exactly_one_service = len(systemd_packages.split()) == 1
+ if has_exactly_one_service:
+ systemd_services = d.getVar('SYSTEMD_SERVICE' + _ +
systemd_packages, 1) or d.getVar('SYSTEMD_SERVICE', 1)
+ has_exactly_one_service = len(systemd_services.split())
== 1
+
+ keys = 'Also' # Conflicts??
+ if has_exactly_one_service:
+ # single service gets also the /dev/null dummies
+ keys = 'Also Conflicts'
+ # scan for all in SYSTEMD_SERVICE[]
+ for pkg_systemd in systemd_packages.split():
+ systemd_services = d.getVar('SYSTEMD_SERVICE' + _ +
pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
+ for service in systemd_services.split():
+ path_found = ''
+ for path in searchpaths.split():
+ if os.path.exists('${D}' + path +
service):
+ path_found = path
+ if path_found != '':
+
systemd_add_files_and_parse(pkg_systemd, path_found, service, keys)
+ else:
+ raise bb.build.FuncFailed, \n\nFor
package %s SYSTEMD_SERVICE-entry %s does not exist % \
+ (pkg_systemd, service)
+
# run all modifications once when creating package
if os.path.exists('${D}'):
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_generate_package_scripts(pkg_systemd)
+
[oe] [meta-oe V3 12/23] openssh: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
.../openssh/openssh_5.9p1.bbappend | 14 +-
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend
b/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend
index 3f68e09..de7668f 100644
--- a/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend
+++ b/meta-oe/recipes-connectivity/openssh/openssh_5.9p1.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}:
-PRINC := ${@int(PRINC) + 1}
+PRINC := ${@int(PRINC) + 2}
SYSTEMD_PACKAGES = openssh-sshd-systemd
SYSTEMD_SERVICE = sshd.socket
@@ -8,15 +8,3 @@ SYSTEMD_SERVICE = sshd.socket
inherit systemd
SRC_URI += file://sshd.socket file://sshd@.service file://sshdgenkeys.service
-
-do_install_append() {
- install -d ${D}${base_libdir}/systemd/system
- install -m 644 ${WORKDIR}/sshd.socket ${D}${base_libdir}/systemd/system
- install -m 644 ${WORKDIR}/sshd@.service
${D}${base_libdir}/systemd/system
- install -m 644 ${WORKDIR}/sshdgenkeys.service
${D}${base_libdir}/systemd/system
-}
-
-PACKAGES =+ openssh-sshd-systemd
-
-FILES_openssh-sshd-systemd += ${base_libdir}/systemd
-RDEPENDS_openssh-sshd-systemd += openssh-sshd
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 03/23] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE
after recipe parsing the following plausibilities are checked:
* ERROR if empty SYSTEMD_PACKAGES
* ERROR if SYSTEMD_PACKAGES entry does not contain '-systemd' AND
package_name != ${PN}
* ERROR if SYSTEMD_PACKAGES entry contains '-systemd' but entry without
'-systemd' (base pkg) does not exist
* WARNING if SYSTEMD_PACKAGES containing ${PN} to force package maintainers to
split out systemd-specific files into *-systemd
* error if SYSTEMD_SERVICE(_systemd-package) is empty for one or more entries
in SYSTEMD_PACKAGES
The code in populate_packages_prepend to set SYSTEMD_PACKAGES to ${PN} as
default was removed.
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
meta-oe/classes/systemd.bbclass | 47 --
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 91faab9..a99036c 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -27,9 +27,45 @@ systemctl disable ${SYSTEMD_SERVICE}
}
def systemd_after_parse(d):
-if bb.data.getVar('SYSTEMD_PACKAGES', d) == None:
-if bb.data.getVar('SYSTEMD_SERVICE', d) == None:
-raise bb.build.FuncFailed, %s inherits systemd but doesn't set
SYSTEMD_SERVICE % bb.data.getVar('FILE', d)
+ def systemd_check_vars():
+ bpn = d.getVar('BPN', 1)
+ # not for native / only at parse time
+ if d.getVar('BB_WORKERCONTEXT', True) is None and \
+ bpn + -native != d.getVar('PN', 1) and \
+ bpn + -cross != d.getVar('PN', 1) and \
+ bpn + -nativesdk != d.getVar('PN', 1):
+ bb_filename = d.getVar('FILE')
+ packages = d.getVar('PACKAGES', 1)
+
+ # check SYSTEMD_PACKAGES
+ systemd_pkgs = d.getVar('SYSTEMD_PACKAGES', 1) or
+ if systemd_pkgs == :
+ raise bb.build.FuncFailed, \n\n%s inherits
systemd but doesn't set SYSTEMD_PACKAGES % bb_filename
+ for pkg_systemd in systemd_pkgs.split():
+ if pkg_systemd.find(-systemd) == -1:
+ if pkg_systemd != d.getVar('PN', 1):
+ raise bb.build.FuncFailed, \
+ \n\n%s: %s in
SYSTEMD_PACKAGES does not match existing-package-systemd or ${PN}
(deprecated) % \
+ (bb_filename,
pkg_systemd)
+ else:
+ bb.warn(%s: it is recommended
to set SYSTEMD_PACKAGES as existing-package-systemd % bb_filename)
+ else:
+ pkg_systemd_base =
pkg_systemd.replace('-systemd', '')
+ if pkg_systemd_base not in packages:
+ raise bb.build.FuncFailed, \
+ \n\n%s: %s in
SYSTEMD_PACKAGES does not match existing-package-systemd or ${PN}
(deprecated) % \
+ ( bb_filename,
pkg_systemd)
+
+ # check SYSTEMD_SERVICE
+ for pkg_systemd in systemd_pkgs.split():
+ service_pkg = 'SYSTEMD_SERVICE' + _ +
pkg_systemd
+ systemd_services = d.getVar(service_pkg, 1) or
d.getVar('SYSTEMD_SERVICE', 1) or
+ if systemd_services == :
+ raise bb.build.FuncFailed, \n\n%s
inherits systemd but doesn't set SYSTEMD_SERVICE / %s % (bb_filename,
service_pkg)
+
+
+ systemd_check_vars()
+
python __anonymous() {
systemd_after_parse(d)
@@ -72,11 +108,6 @@ python populate_packages_prepend () {
pkgs = bb.data.getVar('SYSTEMD_PACKAGES', d, 1)
- if pkgs == None:
- pkgs = bb.data.getVar('PN', d, 1)
- packages = (bb.data.getVar('PACKAGES', d, 1) or ).split()
- if not pkgs in packages and packages != []:
- pkgs = packages[0]
for pkg in pkgs.split():
systemd_package(pkg)
}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 02/23] systemd.bbclass: introduce systemd_unitdir
Follow suggestion in [1]
[1]
http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-February/038018.html
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/classes/systemd.bbclass |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 2ca7bfc..91faab9 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -1,5 +1,7 @@
DEPENDS_append = systemd-systemctl-native
+systemd_unitdir = ${base_libdir}/systemd
+
systemd_postinst() {
OPTS=
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 13/23] elsa: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
meta-efl/recipes-efl/efl/elsa_svn.bb | 11 +--
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb
b/meta-efl/recipes-efl/efl/elsa_svn.bb
index a079ec0..70b56bd 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -13,23 +13,14 @@ S = ${WORKDIR}/${SRCNAME}
EXTRA_OECONF = --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc
${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}
-PR = r4
+PR = r5
PV = 0.0.4+svnr${SRCPV}
SRCREV = ${EFL_SRCREV}
-do_install_append() {
-install -d ${D}${base_libdir}/systemd/system/
-install -m 0644 ${WORKDIR}/xserver-nodm.service
${D}${base_libdir}/systemd/system/xserver-nodm.service
-}
-
inherit systemd
SYSTEMD_PACKAGES = ${PN}-systemd
SYSTEMD_SERVICE = xserver-nodm.service
-PACKAGES =+ ${PN}-systemd
-FILES_${PN}-systemd += ${base_libdir}/systemd
-RDEPENDS_${PN}-systemd += ${PN}
-
RDEPENDS_${PN} += ${PN}-themes sessreg xauth
CONFFILES_${PN} += ${sysconfdir}/elsa.conf
RCONFLICTS_${PN} += xserver-nodm-init
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 00/23] systemd rework
V1 - V2:
[2] do not check configuration variables for cross and nativesdk
[3] rename systemd_package to systemd_generate_package_scripts
[6] parse unit files to determine the files to pack
[7] create warning if *-systemd package already rdepends
it's base package
added in V2:
[8]-[20] remove obsolet systemd code from recipes (these were used as
test cases)
[21] dhcp-(relay) test case for multiple systemd packages
[22] modified to start service
V2 - V3:
(Hopefully) all suggestions and comments were incorporated / rebased
[2] new: introduce systemd_unitdir
[3] was [2] commit message changed (removed V1-V2 hint)
[6] was [5] incorporated ${systemd_unitdir}
[7] new: run code in populate_packages_prepend only if ${D} exists
[8] was [6] rework: for *.socket add corresponding *.service and *@.service
[9] was [7] rework: if RDEPENDS_base-package-systemd is set only append
systemd
[10] was [8] incorporated ${systemd_unitdir}
[11] was [9] incorporated ${systemd_unitdir}
[15] was [13] keep RDEPENDS_${PN}-systemd to override systemd.bbclass's
suggestion
[17] was [15] rebased
[19] was [17] incorporated ${systemd_unitdir}
[22] was [20] incorporated ${systemd_unitdir}
old [22] was remove since it is now properly handled by systemd.bbclass
Tests performed:
- with INHERIT += 'rm_work'
1. setup build system to unpatched state
2. build image
3. apply all patches of this series
4. incremental build image
5. check buildhistory diff
6. (re)build all recipes affected
7. check buildhistory results
- without INHERIT += 'rm_work'
1. apply all patches of this series
2. build image from scratch
3. check buildhistory results for recipes touched series and build by image
4. delete temp dir / retain sstate-cache
5. build image
6. check buildhistory diffs
This patch series can be pulled from:
git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded-systemd.git branch
systemd3
Andreas Müller (23):
systemd-systemctl-native: add multiple services support
systemd.bbclass: introduce systemd_unitdir
systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and
SYSTEMD_SERVICE
systemd.bbclass: cosmetics
systemd.bbclass: automatically create packages set in
SYSTEMD_PACKAGES
systemd.bbclass: automatically install all *.service and *.socket
supplied in recipe's SRC_URI
systemd.bbclass: run code in populate_packages_prepend only if ${D}
exists
systemd.bbclass: automatically extend FILES_* for systemd packages
systemd.bbclass: automatically extend RDEPENDS for *-systemd packages
connman: remove unneeded systemd code / use ${systemd_unitdir}
dropbear: remove unneeded systemd code / use ${systemd_unitdir}
openssh: remove unneeded systemd code
elsa: remove unneeded systemd code
cronie: remove unneeded systemd code
xserver-nodm-init: remove unneeded systemd code
atftp: remove unneeded systemd code
udisks: remove unneeded systemd code
rsyslog: remove unneeded systemd code
syslog-ng: remove unneeded systemd code / use ${systemd_unitdir}
dhcp: remove unneeded systemd code
gpsd: remove unneeded systemd code
busybox: remove unneeded systemd code / use ${systemd_unitdir}
dhcp: add native systemd support for dhcp-relay
meta-efl/recipes-efl/efl/elsa_svn.bb | 11 +--
meta-oe/classes/systemd.bbclass| 165 +---
.../connman/connman_0.78.bbappend |9 +-
.../recipes-connectivity/dhcp/dhcp_4.2.0.bbappend | 18 +--
.../dhcp/files/dhcrelay.service| 10 ++
.../openssh/openssh_5.9p1.bbappend | 14 +--
.../recipes-core/busybox/busybox_1.19.3.bbappend | 15 +--
.../dropbear/dropbear_2011.54.bbappend | 13 +--
.../systemd/systemd-systemctl-native/systemctl | 75 +
meta-oe/recipes-extended/atftp/atftp_0.7.bb| 10 +-
.../recipes-extended/cronie/cronie_1.4.8.bbappend | 12 +--
meta-oe/recipes-extended/rsyslog/rsyslog.inc |7 +-
.../xserver-nodm-init/xserver-nodm-init_2.0.bb |9 +-
meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb | 12 +--
meta-oe/recipes-support/syslog-ng/syslog-ng.inc|9 +-
meta-oe/recipes-support/udisks/udisks_1.0.4.bb |9 +-
16 files changed, 224 insertions(+), 174 deletions(-)
create mode 100644 meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 15/23] xserver-nodm-init: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../xserver-nodm-init/xserver-nodm-init_2.0.bb |9 +
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git
a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 2132eab..99edf21 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -3,7 +3,7 @@ LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
SECTION = x11
-PR = r12
+PR = r13
SRC_URI = file://xserver-nodm \
file://xserver-nodm.service \
@@ -25,14 +25,7 @@ SYSTEMD_SERVICE_${PN}-systemd = xserver-nodm.service
do_install() {
install -d ${D}${sysconfdir}/init.d
install xserver-nodm ${D}${sysconfdir}/init.d
-
- install -d ${D}${base_libdir}/systemd/system
- install -m 0644 xserver-nodm.service ${D}${base_libdir}/systemd/system/
}
-PACKAGES += ${PN}-systemd
-
RDEPENDS_${PN} = xserver-common (= 1.30) xinit
-
-FILES_${PN}-systemd += ${base_libdir}/systemd/system/
RDEPENDS_${PN}-systemd += xserver-common (= 1.30) xinit
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 01/23] systemd-systemctl-native: add multiple services support
Thanks to Otavio Salvador for helping hint [1]
[1]
http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-February/037856.html
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
.../systemd/systemd-systemctl-native/systemctl | 75 +++-
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
b/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
index 54c1a18..72b9da3 100755
--- a/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
+++ b/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
@@ -10,50 +10,59 @@ while [ $# != 0 ]; do
enable)
shift
- service=$1
+ services=$1
+ in_enable=1
shift
;;
--root=*)
ROOT=${opt##--root=}
+ in_enable=0
shift
;;
*)
- echo '$opt' is an unkown option; exiting with error
- exit 1
+ if [ $in_enable = 1 ]; then
+ services=$services $opt
+ shift
+ else
+ echo '$opt' is an unkown option; exiting with
error
+ exit 1
+ fi
;;
esac
done
-# find service file
-for p in $ROOT/etc/systemd/system \
- $ROOT/lib/systemd/system \
- $ROOT/usr/lib/systemd/system; do
- if [ -e $p/$service ]; then
- service_file=$p/$service
- service_file=${service_file##$ROOT}
+for service in $services; do
+ # find service file
+ for p in $ROOT/etc/systemd/system \
+$ROOT/lib/systemd/system \
+$ROOT/usr/lib/systemd/system; do
+ if [ -e $p/$service ]; then
+ service_file=$p/$service
+ service_file=${service_file##$ROOT}
+ fi
+ done
+ if [ -z $service_file ]; then
+ echo '$service' couldn't be found; exiting with error
+ exit 1
fi
-done
-if [ -z $service_file ]; then
- echo '$service' couldn't be found; exiting with error
- exit 1
-fi
-
-# create the required symbolic links
-wanted_by=$(grep WantedBy $ROOT/$service_file \
-| sed 's,WantedBy=,,g' \
-| tr ',' '\n' \
-| grep '\.target$')
-
-for r in $wanted_by; do
- mkdir -p $ROOT/etc/systemd/system/$r.wants
- ln -s $service_file $ROOT/etc/systemd/system/$r.wants
- echo Enabled $service for $wanted_by.
-done
-# call us for the other required scripts
-also=$(grep Also $ROOT/$service_file \
- | sed 's,Also=,,g' \
- | tr ',' '\n')
-for a in $also; do
- $0 --root=$ROOT enable $a
+ # create the required symbolic links
+ wanted_by=$(grep WantedBy $ROOT/$service_file \
+ | sed 's,WantedBy=,,g' \
+ | tr ',' '\n' \
+ | grep '\.target$')
+
+ for r in $wanted_by; do
+ mkdir -p $ROOT/etc/systemd/system/$r.wants
+ ln -s $service_file $ROOT/etc/systemd/system/$r.wants
+ echo Enabled $service for $wanted_by.
+ done
+
+ # call us for the other required scripts
+ also=$(grep Also $ROOT/$service_file \
+ | sed 's,Also=,,g' \
+ | tr ',' '\n')
+ for a in $also; do
+ $0 --root=$ROOT enable $a
+ done
done
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 04/23] systemd.bbclass: cosmetics
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
meta-oe/classes/systemd.bbclass | 15 +++
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index a99036c..6517357 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -72,7 +72,7 @@ python __anonymous() {
}
python populate_packages_prepend () {
- def systemd_package(pkg):
+ def systemd_generate_package_scripts(pkg):
bb.debug(1, 'adding systemd calls to postinst/postrm for %s' %
pkg)
localdata = bb.data.createCopy(d)
overrides = bb.data.getVar(OVERRIDES, localdata, 1)
@@ -96,10 +96,10 @@ python populate_packages_prepend () {
prerm += bb.data.getVar('systemd_prerm', localdata, 1)
bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d)
- postrm = bb.data.getVar('pkg_postrm', localdata, 1)
- if not postrm:
- postrm = '#!/bin/sh\n'
-postrm += bb.data.getVar('systemd_postrm', localdata, 1)
+ postrm = bb.data.getVar('pkg_postrm', localdata, 1)
+ if not postrm:
+ postrm = '#!/bin/sh\n'
+ postrm += bb.data.getVar('systemd_postrm', localdata, 1)
bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0)
or bb.data.getVar('RDEPENDS', d, 0) or )
@@ -107,7 +107,6 @@ python populate_packages_prepend () {
bb.data.setVar('RDEPENDS_' + pkg, + .join(rdepends), d)
- pkgs = bb.data.getVar('SYSTEMD_PACKAGES', d, 1)
- for pkg in pkgs.split():
- systemd_package(pkg)
+ for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
+ systemd_generate_package_scripts(pkg_systemd)
}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 17/23] udisks: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/recipes-support/udisks/udisks_1.0.4.bb |9 +
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
index 9ffaca5..0018a5f 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
@@ -12,7 +12,7 @@ SRC_URI =
http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
SRC_URI[udisks.md5sum] = 86c63b2b5484f2060499a052b5b6256b
SRC_URI[udisks.sha256sum] =
854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5
-PR = r3
+PR = r4
inherit autotools systemd
@@ -21,11 +21,6 @@ SYSTEMD_SERVICE_${PN}-systemd = udisks-daemon.service
EXTRA_OECONF = --disable-man-pages
-PACKAGES =+ ${PN}-systemd
-
-FILES_${PN}-systemd = ${base_libdir}/systemd/system/
-RDEPENDS_${PN}-systemd = ${PN}
-
FILES_${PN} += ${libdir}/polkit-1/extensions/*.so \
${datadir}/dbus-1/ \
${datadir}/polkit-1 \
@@ -33,5 +28,3 @@ FILES_${PN} += ${libdir}/polkit-1/extensions/*.so \
FILES_${PN}-dbg += ${base_libdir}/udev/.debug
-
-
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 18/23] rsyslog: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
meta-oe/recipes-extended/rsyslog/rsyslog.inc |7 +--
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index ea7fa22..d4552cf 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -4,7 +4,7 @@ HOMEPAGE = http://www.rsyslog.com/;
LICENSE = GPLv3
LIC_FILES_CHKSUM = file://COPYING;md5=51d9635e646fb75e1b74c074f788e973
-INC_PR = r2
+INC_PR = r3
SRC_URI = http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
file://rsyslog.conf
@@ -20,9 +20,4 @@ do_install_append() {
install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
}
-PACKAGES =+ ${PN}-systemd
-
CONFFILES_${PN} = ${sysconfdir}/rsyslog.conf
-
-FILES_${PN}-systemd += ${base_libdir}/systemd
-RDEPENDS_${PN}-systemd += ${PN}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 09/23] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages
* append systemd functionalty moved into systemd_add_rdepends
* append base-pgk in case receipe does not set RDEPENDS for *-systemd package
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/classes/systemd.bbclass | 21 +
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index c712e17..dd423b5 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -122,10 +122,6 @@ python populate_packages_prepend () {
postrm += bb.data.getVar('systemd_postrm', localdata, 1)
bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
- rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0)
or bb.data.getVar('RDEPENDS', d, 0) or )
- rdepends.append(systemd)
- bb.data.setVar('RDEPENDS_' + pkg, + .join(rdepends), d)
-
# add files to FILES_*-systemd if existent and not already done
def systemd_append_file(pkg_systemd, file_append):
appended = False
@@ -185,10 +181,27 @@ python populate_packages_prepend () {
raise bb.build.FuncFailed, \n\nFor
package %s SYSTEMD_SERVICE-entry %s does not exist % \
(pkg_systemd, service)
+ # *-systemd packages get RDEPENDS to systemd and their base package
+ def systemd_add_rdepends(pkg_systemd):
+ # RDEPENDS_${pkg_systemd} += pkg_systemd_base systemd
+ rdepends = d.getVar('RDEPENDS_' + pkg_systemd, 1) or
+ rdepends_arr = rdepends.split()
+ if not 'systemd' in rdepends_arr:
+ rdepends = '%s %s' % (rdepends, 'systemd')
+ pkg_systemd_base = pkg_systemd.replace('-systemd', '')
+ # no automatism for:
+ # recipes setting rdepends themselves AND
+ # not rdepending myself AND
+ # avoid double entries
+ if len(rdepends_arr) == 0 and pkg_systemd != '${PN}' and not
pkg_systemd_base in rdepends:
+ rdepends = '%s %s' % (rdepends, pkg_systemd_base)
+ d.setVar('RDEPENDS_' + pkg_systemd, rdepends)
+
# run all modifications once when creating package
if os.path.exists('${D}'):
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_generate_package_scripts(pkg_systemd)
+ systemd_add_rdepends(pkg_systemd)
systemd_check_services()
}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 21/23] gpsd: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb | 12 ++--
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
b/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
index ce2ab02..927107a 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=d217a23f408e91c94359447735bc1800
DEPENDS = dbus-glib ncurses python libusb1
PROVIDES = virtual/gpsd
-PR = r1
+PR = r2
EXTRA_OECONF = --x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
@@ -68,11 +68,6 @@ do_install_append() {
install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
install -d ${D}${base_libdir}/udev/
install -m 0755 ${S}/gpsd.hotplug.wrapper ${D}${base_libdir}/udev/
-
-#support for systemd
-install -d ${D}${base_libdir}/systemd/system
-install -m 644 ${WORKDIR}/${PN}.socket ${D}${base_libdir}/systemd/system
-install -m 644 ${WORKDIR}/${PN}.service ${D}${base_libdir}/systemd/system
}
pkg_postinst_${PN}-conf() {
@@ -83,7 +78,7 @@ pkg_postrm_${PN}-conf() {
update-alternatives --remove gpsd-defaults
${sysconfdir}/default/gpsd.default
}
-PACKAGES =+ libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf
gpsd-gpsctl gps-utils ${PN}-systemd
+PACKAGES =+ libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf
gpsd-gpsctl gps-utils
FILES_python-pygps-dbg += ${libdir}/python*/site-packages/gps/.debug
@@ -113,6 +108,3 @@ RDEPENDS_gps-utils = python-pygps
DESCRIPTION_python-pygps = Python bindings to gpsd
FILES_python-pygps = ${PYTHON_SITEPACKAGES_DIR}/*
RDEPENDS_python-pygps = python-core python-curses gpsd python-json
-
-FILES_${PN}-systemd += ${base_libdir}/systemd
-RDEPENDS_${PN}-systemd += ${PN}
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 22/23] busybox: remove unneeded systemd code / use ${systemd_unitdir}
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
.../recipes-core/busybox/busybox_1.19.3.bbappend | 15 +--
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
index 98b959f..2c73732 100644
--- a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
+++ b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
@@ -1,6 +1,6 @@
inherit systemd
-PRINC := ${@int(PRINC) + 2}
+PRINC := ${@int(PRINC) + 3}
# look for files in the layer first
FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}:
@@ -16,16 +16,11 @@ do_install_append() {
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/busybox-syslog.default
${D}${sysconfdir}/default/busybox-syslog
- install -d ${D}${base_libdir}/systemd/system
sed 's,@base_sbindir@,${base_sbindir},g'
${WORKDIR}/busybox-syslog.service.in \
- ${D}${base_libdir}/systemd/system/busybox-syslog.service
+ ${D}${systemd_unitdir}/system/busybox-syslog.service
sed 's,@base_sbindir@,${base_sbindir},g'
${WORKDIR}/busybox-klogd.service.in \
- ${D}${base_libdir}/systemd/system/busybox-klogd.service
+ ${D}${systemd_unitdir}/system/busybox-klogd.service
- ln -sf /dev/null ${D}${base_libdir}/systemd/system/syslog.service
+ ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
}
-
-PACKAGES += ${PN}-syslog-systemd
-
-RDEPENDS_${PN}-syslog-systemd += ${PN}-syslog
-FILES_${PN}-syslog-systemd = ${base_libdir}/systemd
+FILES_${PN}-syslog-systemd = ${systemd_unitdir}/system/syslog.service
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 19/23] syslog-ng: remove unneeded systemd code / use ${systemd_unitdir}
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc |9 ++---
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 3bbebec..3489ac5 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5
# update-rc.d and update-alternatives is important
RDEPENDS_${PN} += ${@base_conditional(ONLINE_PACKAGE_MANAGEMENT, none,
, update-rc.d, d)}
-INC_PR = r6
+INC_PR = r7
inherit autotools systemd
@@ -26,7 +26,7 @@ EXTRA_OECONF = \
--disable-pcre \
--disable-sql \
--enable-systemd \
- --with-systemdsystemunitdir=${base_libdir}/systemd/system \
+ --with-systemdsystemunitdir=${systemd_unitdir}/system \
do_configure_prepend() {
@@ -47,11 +47,6 @@ do_install_append() {
SYSTEMD_PACKAGES = ${PN}-systemd
SYSTEMD_SERVICE = ${PN}.service
-PACKAGES =+ ${PN}-systemd
-
-FILES_${PN}-systemd += ${base_libdir}/systemd
-RDEPENDS_${PN}-systemd += ${PN}
-
FILES_${PN} = ${bindir}/* ${sbindir}/* ${libexecdir}/*
${libdir}/lib*${SOLIBS} \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* \
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 20/23] dhcp: remove unneeded systemd code
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
.../recipes-connectivity/dhcp/dhcp_4.2.0.bbappend | 12 +---
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
index 4344eaa..829ad3c 100644
--- a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
+++ b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
@@ -3,19 +3,9 @@ FILESEXTRAPATHS := ${THISDIR}/files
inherit systemd
-PRINC := ${@int(PRINC) + 1}
+PRINC := ${@int(PRINC) + 2}
SYSTEMD_PACKAGES = dhcp-server-systemd
SYSTEMD_SERVICE_dhcp-server-systemd = dhcpd.service
SRC_URI += file://dhcpd.service
-
-do_install_append() {
-install -d ${D}${base_libdir}/systemd/system
-install -m 644 ${WORKDIR}/dhcpd.service ${D}${base_libdir}/systemd/system
-}
-
-PACKAGES =+ dhcp-server-systemd
-
-FILES_dhcp-server-systemd += ${base_libdir}/systemd
-RDEPENDS_dhcp-server-systemd += dhcp-server
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V3 23/23] dhcp: add native systemd support for dhcp-relay
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
Acked-by: Otavio Salvador ota...@ossystems.com.br
---
.../recipes-connectivity/dhcp/dhcp_4.2.0.bbappend |8 +---
.../dhcp/files/dhcrelay.service| 10 ++
2 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
index 829ad3c..6d1e3df 100644
--- a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
+++ b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
@@ -3,9 +3,11 @@ FILESEXTRAPATHS := ${THISDIR}/files
inherit systemd
-PRINC := ${@int(PRINC) + 2}
+PRINC := ${@int(PRINC) + 3}
-SYSTEMD_PACKAGES = dhcp-server-systemd
+SYSTEMD_PACKAGES = dhcp-server-systemd dhcp-relay-systemd
SYSTEMD_SERVICE_dhcp-server-systemd = dhcpd.service
+SYSTEMD_SERVICE_dhcp-relay-systemd = dhcrelay.service
-SRC_URI += file://dhcpd.service
+SRC_URI += file://dhcpd.service \
+file://dhcrelay.service
diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
b/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
new file mode 100644
index 000..f68f468
--- /dev/null
+++ b/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=DHCP Relay Agent Daemon
+After=syslog.target network.target
+
+[Service]
+EnvironmentFile=/etc/default/dhcp-relay
+ExecStart=/usr/sbin/dhcrelay -d $DHCRELAYARGS
+
+[Install]
+WantedBy=multi-user.target
--
1.7.6.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe V3 00/23] systemd rework
On Thu, Feb 23, 2012 at 10:10, Andreas Müller
schnitzelt...@googlemail.com wrote:
V2 - V3:
(Hopefully) all suggestions and comments were incorporated / rebased
This patchset is ready for merging IMO.
Checking remaining recipes that might be change to use
${systemd_unitdir} I found:
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
meta-oe/recipes-connectivity/cherokee/cherokee.inc
meta-oe/recipes-connectivity/gateone/gateone_git.bb
meta-oe/recipes-core/systemd/systemd-compat-units.bb
meta-oe/recipes-core/systemd/systemd-serialgetty.bb
meta-oe/recipes-core/systemd/systemd_git.bb
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
meta-oe/recipes-graphics/slim/slim_1.3.2.bb
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
I dropped udev ones as I am working on them :-)
--
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-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe V3 00/23] systemd rework
On Thu, Feb 23, 2012 at 10:31:26AM -0200, Otavio Salvador wrote:
On Thu, Feb 23, 2012 at 10:10, Andreas Müller
schnitzelt...@googlemail.com wrote:
V2 - V3:
(Hopefully) all suggestions and comments were incorporated / rebased
This patchset is ready for merging IMO.
Agreed, just tested in my build and looks good.
Great work Andreas!
Checking remaining recipes that might be change to use
${systemd_unitdir} I found:
I have patch for few:
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
meta-oe/recipes-connectivity/gateone/gateone_git.bb
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
and networkmanager
but the rest doesn't inherit systemd (yet), so we should update it when
changing them to use systemd.bbclass.
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
meta-oe/recipes-connectivity/cherokee/cherokee.inc
meta-oe/recipes-core/systemd/systemd-compat-units.bb
meta-oe/recipes-core/systemd/systemd-serialgetty.bb
meta-oe/recipes-core/systemd/systemd_git.bb
meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
meta-oe/recipes-graphics/slim/slim_1.3.2.bb
I dropped udev ones as I am working on them :-)
--
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-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
* maybe we should move systemd_unitdir definition outside systemd.bbclass
because it's used in few more recipes which doesn't inherit systemd
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../recipes-connectivity/gateone/gateone_git.bb|4 ++--
.../networkmanager/networkmanager_0.9.2.0.bb |2 +-
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb|6 +++---
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb |8
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index 4f9684c..84da893 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -20,8 +20,8 @@ export prefix = ${localstatedir}/lib
do_install_append() {
install -d ${D}${localstatedir}/log/${BPN}
- install -m 0755 -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/gateone.service
${D}${base_libdir}/systemd/system/
+ install -m 0755 -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/gateone.service
${D}${systemd_unitdir}/system/
install -m 0755 -d ${D}${sysconfdir}/avahi/services/
install -m 0644 ${WORKDIR}/gateone-avahi.service
${D}${sysconfdir}/avahi/services/
diff --git
a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
index 1dcc3cf..df269e0 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
@@ -70,7 +70,7 @@ FILES_${PN} += \
${datadir}/polkit-1 \
${datadir}/dbus-1 \
${base_libdir}/udev/* \
-${base_libdir}/systemd \
+${systemd_unitdir} \
RRECOMMENDS_${PN} += iptables
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
index 4e95075..bef2f36 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
@@ -98,8 +98,8 @@ do_install () {
install -m 0644 ${WORKDIR}/o3/modules/o3.js
${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
install -m 0755 ${WORKDIR}/o3/o3.node
${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
- install -m 0755 -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/cloud9.service ${D}${base_libdir}/systemd/system/
+ install -m 0755 -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system/
install -m 0755 -d ${D}${sysconfdir}/avahi/services/
install -m 0644 ${WORKDIR}/cloud9-avahi.service
${D}${sysconfdir}/avahi/services/
@@ -109,7 +109,7 @@ FILES_${PN}-dbg +=
${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o
${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
-FILES_${PN} += ${base_libdir}/systemd/system
+FILES_${PN} += ${systemd_unitdir}/system
RDEPENDS_${PN} = nodejs gzip
inherit systemd
diff --git a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
index 063d82a..292a1f6 100644
--- a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
+++ b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
@@ -29,14 +29,14 @@ do_install_append() {
install -d ${D}/${sysconfdir}/network/if-up.d
install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
- install -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/ntpdate.service
${D}${base_libdir}/systemd/system/
- install -m 0644 ${WORKDIR}/ntpd.service
${D}${base_libdir}/systemd/system/
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/ntpdate.service
${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
}
PACKAGES =+ ${PN}-systemd
-FILES_${PN}-systemd = ${base_libdir}/systemd/system/
+FILES_${PN}-systemd = ${systemd_unitdir}/system/
RDEPENDS_${PN}-systemd = ${PN}
FILES_${PN}-bin = ${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq
${bindir}/ntptime ${bindir}/ntptrace
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe V3 00/23] systemd rework
On Thu, Feb 23, 2012 at 1:31 PM, Otavio Salvador
ota...@ossystems.com.br wrote:
On Thu, Feb 23, 2012 at 10:10, Andreas Müller
schnitzelt...@googlemail.com wrote:
V2 - V3:
(Hopefully) all suggestions and comments were incorporated / rebased
This patchset is ready for merging IMO.
Checking remaining recipes that might be change to use
${systemd_unitdir} I found:
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
meta-oe/recipes-connectivity/cherokee/cherokee.inc
meta-oe/recipes-connectivity/gateone/gateone_git.bb
meta-oe/recipes-core/systemd/systemd-compat-units.bb
meta-oe/recipes-core/systemd/systemd-serialgetty.bb
meta-oe/recipes-core/systemd/systemd_git.bb
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend
meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
meta-oe/recipes-graphics/slim/slim_1.3.2.bb
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
I dropped udev ones as I am working on them :-)
I had these in my first RFC series - most of them can be taken without
modification - I think. But as mentioned, I left them out here because
I wanted to wait for a solution for ?-FEATURE to avoid modifying tons
of tasks/images spreaded on different layers. Is there a solution on
scratch?
Andreas
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe V3 00/23] systemd rework
On Thu, Feb 23, 2012 at 10:39, Martin Jansa martin.ja...@gmail.com wrote: I have patch for few: meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb meta-oe/recipes-connectivity/gateone/gateone_git.bb meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb and networkmanager Please send them above this patchset so we can get them pulled altogether if does fine. :-D -- 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-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
On Thu, Feb 23, 2012 at 10:40, Martin Jansa martin.ja...@gmail.com wrote: * maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd Please split this patch and do PR bump so we get them rebuild. -- 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-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
On Thu, Feb 23, 2012 at 10:50:02AM -0200, Otavio Salvador wrote: On Thu, Feb 23, 2012 at 10:40, Martin Jansa martin.ja...@gmail.com wrote: * maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd Please split this patch and do PR bump so we get them rebuild. why? the output is 100% the same. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
On Thu, Feb 23, 2012 at 10:58, Martin Jansa martin.ja...@gmail.com wrote: On Thu, Feb 23, 2012 at 10:50:02AM -0200, Otavio Salvador wrote: On Thu, Feb 23, 2012 at 10:40, Martin Jansa martin.ja...@gmail.com wrote: * maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd Please split this patch and do PR bump so we get them rebuild. why? the output is 100% the same. Well; from previous experience any change can have strange results so I'd prefer to build them again. -- 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-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH 3/7] postgresql: include Makefile.global in SSTATE_SCAN_FILES
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-support/postgresql/postgresql.inc |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc
b/meta-oe/recipes-support/postgresql/postgresql.inc
index 53c38df..ab6aea4 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -2,7 +2,7 @@ DESCRIPTION = PostgreSQL is a powerful, open source relational
database system.
HOMEPAGE = http://www.postgresql.com;
LICENSE = BSD
DEPENDS = zlib readline tzcode-native
-INC_PR = r5
+INC_PR = r6
ARM_INSTRUCTION_SET = arm
@@ -23,6 +23,8 @@ do_compile_append() {
cp /usr/sbin/zic ${S}/src/timezone/
}
+SSTATE_SCAN_FILES += Makefile.global
+
PACKAGES =+ ${PN}-client ${PN}-server-dev ${PN}-timezone \
libecpg-compat-dbg libecpg-compat \
libecpg-dbg libecpg libecpg-dev \
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
On Thu, Feb 23, 2012 at 11:10:18AM -0200, Otavio Salvador wrote: On Thu, Feb 23, 2012 at 10:58, Martin Jansa martin.ja...@gmail.com wrote: On Thu, Feb 23, 2012 at 10:50:02AM -0200, Otavio Salvador wrote: On Thu, Feb 23, 2012 at 10:40, Martin Jansa martin.ja...@gmail.com wrote: * maybe we should move systemd_unitdir definition outside systemd.bbclass because it's used in few more recipes which doesn't inherit systemd Please split this patch and do PR bump so we get them rebuild. why? the output is 100% the same. Well; from previous experience any change can have strange results so I'd prefer to build them again. splitted and with PR bumps in contrib/jansa/pull Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
On Thu, Feb 23, 2012 at 12:53, Martin Jansa martin.ja...@gmail.com wrote: splitted and with PR bumps in contrib/jansa/pull I think Koen would prefer if you resend them so he can get them from patchwork. Not sure though... -- 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-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 23-02-12 15:58, Otavio Salvador schreef: On Thu, Feb 23, 2012 at 12:53, Martin Jansa martin.ja...@gmail.com wrote: splitted and with PR bumps in contrib/jansa/pull I think Koen would prefer if you resend them so he can get them from patchwork. Not sure though... I'm fine with jansa/pull as well. As a rule of thumb: resending allows more people to review them again. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (Darwin) Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAk9GXtkACgkQMkyGM64RGpHLXACgqZNixEjxlA2vC4/8dy264qoz 36sAoLi9mt5kyUTIPjIPDHP5Do7ZHbCE =mlVt -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe 1/1] toscoterm: add
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta-oe/recipes-support/toscoterm/toscoterm_git.bb | 26
1 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-support/toscoterm/toscoterm_git.bb
diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
new file mode 100644
index 000..d31b529
--- /dev/null
+++ b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = A very small and simple terminal emulator
+SECTION = x11/applications
+DEPENDS = vte
+RDEPENDS += glibc-gconv-ibm437
+
+LICENSE = GPLv3
+LIC_FILES_CHKSUM =
file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa94530026bd15229
+
+# 0.2 version
+SRCREV = 8586d617aed19fc75f5ae1e07270752c1b2f9a30
+SRC_URI = git://github.com/OSSystems/toscoterm.git
+
+S = ${WORKDIR}/git
+
+inherit gitpkgv pkgconfig
+
+do_compile() {
+ oe_runmake \
+ CC=${CC} \
+ CFLAGS=`pkg-config --cflags vte`${CFLAGS} \
+ LDFLAGS=`pkg-config --libs vte` ${LDFLAGS}
+}
+
+do_install() {
+ oe_runmake PREFIX=/usr DESTDIR=${D} install
+}
--
1.7.2.5
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] gateone, networkmanager, cloud9, ntp: use systemd_unitdir variable
On Thu, Feb 23, 2012 at 04:44:27PM +0100, Koen Kooi wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 23-02-12 15:58, Otavio Salvador schreef: On Thu, Feb 23, 2012 at 12:53, Martin Jansa martin.ja...@gmail.com wrote: splitted and with PR bumps in contrib/jansa/pull I think Koen would prefer if you resend them so he can get them from patchwork. Not sure though... I'm fine with jansa/pull as well. As a rule of thumb: resending allows more people to review them again. OK, will resend will remove not changed patches from pull-* so they are not resent by send-pull-request (probably easiest way to send new patches in same branch without spamming ML with patches which weren't changed at all) Cheers, -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (Darwin) Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAk9GXtkACgkQMkyGM64RGpHLXACgqZNixEjxlA2vC4/8dy264qoz 36sAoLi9mt5kyUTIPjIPDHP5Do7ZHbCE =mlVt -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/7] PACKAGECONFIG for polkit and foxtrotgps upgrade - added more patches for systemd and sstate
First 2 patches are the same,
Added 4 more patches for systemd_unitdir variable and 1 patch for sstate
The following changes since commit 4751336bc02d6881efff1c0c6a1b449a156eb723:
vsftpd: add new package (2012-02-22 12:23:16 +0100)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Martin Jansa (7):
foxtrotgps: upgrade to 1.1.0
polkit: enable and disable systemd/consolekit support explicitly
postgresql: include Makefile.global in SSTATE_SCAN_FILES
gateone: use systemd_unitdir variable
networkmanager: use systemd_unitdir variable
cloud9: use systemd_unitdir variable
ntp: use systemd_unitdir variable
.../recipes-connectivity/gateone/gateone_git.bb|6 +-
.../networkmanager/networkmanager_0.9.2.0.bb |4 +-
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb|8 ++--
.../recipes-extended/polkit/polkit_0.104.bbappend |7 ++-
.../foxtrotgps-1.0.1/remove.unused.header.patch| 40
.../{foxtrotgps_1.0.1.bb = foxtrotgps_1.1.0.bb} |8 +--
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb | 10 ++--
meta-oe/recipes-support/postgresql/postgresql.inc |4 +-
8 files changed, 25 insertions(+), 62 deletions(-)
delete mode 100644
meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
rename meta-oe/recipes-navigation/foxtrotgps/{foxtrotgps_1.0.1.bb =
foxtrotgps_1.1.0.bb} (61%)
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/7] postgresql: include Makefile.global in SSTATE_SCAN_FILES
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-support/postgresql/postgresql.inc |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc
b/meta-oe/recipes-support/postgresql/postgresql.inc
index 53c38df..ab6aea4 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -2,7 +2,7 @@ DESCRIPTION = PostgreSQL is a powerful, open source relational
database system.
HOMEPAGE = http://www.postgresql.com;
LICENSE = BSD
DEPENDS = zlib readline tzcode-native
-INC_PR = r5
+INC_PR = r6
ARM_INSTRUCTION_SET = arm
@@ -23,6 +23,8 @@ do_compile_append() {
cp /usr/sbin/zic ${S}/src/timezone/
}
+SSTATE_SCAN_FILES += Makefile.global
+
PACKAGES =+ ${PN}-client ${PN}-server-dev ${PN}-timezone \
libecpg-compat-dbg libecpg-compat \
libecpg-dbg libecpg libecpg-dev \
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/7] gateone: use systemd_unitdir variable
* maybe we should move systemd_unitdir definition outside systemd.bbclass
because it's used in few more recipes which doesn't inherit systemd
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../recipes-connectivity/gateone/gateone_git.bb|6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index 4f9684c..aee88f3 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = HTML5 (plugin-free) web-based terminal emulator
and SSH client
LICENSE = AGPLv3
LIC_FILES_CHKSUM = file://LICENSE.txt;md5=07d5a2790569bd3e3b422b69ccd43bec
-PR = r15
+PR = r16
PV = 0.9
SRCREV = a68444610efa2892842893dae828a28527e64a6e
@@ -20,8 +20,8 @@ export prefix = ${localstatedir}/lib
do_install_append() {
install -d ${D}${localstatedir}/log/${BPN}
- install -m 0755 -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/gateone.service
${D}${base_libdir}/systemd/system/
+ install -m 0755 -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/gateone.service
${D}${systemd_unitdir}/system/
install -m 0755 -d ${D}${sysconfdir}/avahi/services/
install -m 0644 ${WORKDIR}/gateone-avahi.service
${D}${sysconfdir}/avahi/services/
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 5/7] networkmanager: use systemd_unitdir variable
* maybe we should move systemd_unitdir definition outside systemd.bbclass
because it's used in few more recipes which doesn't inherit systemd
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../networkmanager/networkmanager_0.9.2.0.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
index 1dcc3cf..38fac08 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
@@ -4,7 +4,7 @@ SECTION = net/misc
LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=cbbffd568227ada506640fe950a4823b
-PR = r2
+PR = r3
DEPENDS = systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls
util-linux ppp
inherit gnome gettext
@@ -70,7 +70,7 @@ FILES_${PN} += \
${datadir}/polkit-1 \
${datadir}/dbus-1 \
${base_libdir}/udev/* \
-${base_libdir}/systemd \
+${systemd_unitdir} \
RRECOMMENDS_${PN} += iptables
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 6/7] cloud9: use systemd_unitdir variable
* maybe we should move systemd_unitdir definition outside systemd.bbclass
because it's used in few more recipes which doesn't inherit systemd
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
index 4e95075..7041527 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018
DEPENDS = libxml2 nodejs-native
-PR = r13
+PR = r14
SRC_URI = git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
@@ -98,8 +98,8 @@ do_install () {
install -m 0644 ${WORKDIR}/o3/modules/o3.js
${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
install -m 0755 ${WORKDIR}/o3/o3.node
${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
- install -m 0755 -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/cloud9.service ${D}${base_libdir}/systemd/system/
+ install -m 0755 -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system/
install -m 0755 -d ${D}${sysconfdir}/avahi/services/
install -m 0644 ${WORKDIR}/cloud9-avahi.service
${D}${sysconfdir}/avahi/services/
@@ -109,7 +109,7 @@ FILES_${PN}-dbg +=
${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o
${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
-FILES_${PN} += ${base_libdir}/systemd/system
+FILES_${PN} += ${systemd_unitdir}/system
RDEPENDS_${PN} = nodejs gzip
inherit systemd
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 7/7] ntp: use systemd_unitdir variable
* maybe we should move systemd_unitdir definition outside systemd.bbclass
because it's used in few more recipes which doesn't inherit systemd
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
index 063d82a..ece8720 100644
--- a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
+++ b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
@@ -1,6 +1,6 @@
require ntp.inc
-PR = r4
+PR = r5
inherit systemd
@@ -29,14 +29,14 @@ do_install_append() {
install -d ${D}/${sysconfdir}/network/if-up.d
install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d
- install -d ${D}${base_libdir}/systemd/system
- install -m 0644 ${WORKDIR}/ntpdate.service
${D}${base_libdir}/systemd/system/
- install -m 0644 ${WORKDIR}/ntpd.service
${D}${base_libdir}/systemd/system/
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/ntpdate.service
${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
}
PACKAGES =+ ${PN}-systemd
-FILES_${PN}-systemd = ${base_libdir}/systemd/system/
+FILES_${PN}-systemd = ${systemd_unitdir}/system/
RDEPENDS_${PN}-systemd = ${PN}
FILES_${PN}-bin = ${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq
${bindir}/ntptime ${bindir}/ntptrace
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-mozilla] firefox does not fetch
Hi just noticed that firefox URI seems to have moved ERROR: Function failed: Fetcher failure for URL: 'http://archive.mozilla.org/pub/mozilla.org/firefox/releases/10.0.1/source/firefox-10.0.1.source.tar.bz2;name=archive'. Unable to fetch URL from any source. I was about to prepare a patch for this fetching from ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.1/source/firefox-10.0.1.source.tar.bz2 but it seems that has a different checksum so I did not want to jump into this. Cheers Andreas ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-mozilla] firefox does not fetch
On Thu, Feb 23, 2012 at 15:15, Andreas Müller schnitzelt...@googlemail.com wrote: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.1/source/firefox-10.0.1.source.tar.bz2 but it seems that has a different checksum so I did not want to jump into this. If you have time (and enough energy) you might update it to 10.0.2 and move it to the ftp on same changeset. -- 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-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] gcc-cross-initial patching fails
Op 22 feb. 2012, om 22:39 heeft Andreas Müller het volgende geschreven: On Wed, Feb 22, 2012 at 10:18 PM, Khem Raj raj.k...@gmail.com wrote: On Wed, Feb 22, 2012 at 12:15 PM, McClintock Matthew-B29882 b29...@freescale.com wrote: Applying patch gcc45-no-add-needed.patch patching file gcc/config/alpha/elf.h patching file gcc/config/ia64/linux.h patching file gcc/config/linux.h Hunk #1 succeeded at 89 (offset -12 lines). patching file gcc/config/rs6000/sysv4.h Hunk #1 FAILED at 908. 1 out of 1 hunk FAILED -- rejects in file gcc/config/rs6000/sysv4.h Patch gcc45-no-add-needed.patch does not apply (enforce with -f) ERROR: Function failed: patch_do_patch ERROR: Logfile of failure stored in: /home/Superandy/tmp/oe-core-eglibc/work-shared/gcc-4.5-r45+svnr181733/temp/log.do_patch.5367 NOTE: package gcc-cross-initial-4.5-r45+svnr181733: task do_patch: Failed ERROR: Task 2829 (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross-initial_4.5.bb, do_patch) failed with exit code '1' git log does not help me much - what goes wrong? Which actual patch is it failing on? Is there a conflict between oe-core and meta-oe patch set against gcc? gcc45-no-add-needed.patch is the patch in question. I dont see anything wrong with it. Can you do bitbake -ccleanall gcc-cross-initial and redo bitbake gcc-cross-initial -cpatch ? FYI: I removed the line which came in by the commits I mentioned above should_apply[vardepsexclude] += PN in openembedded-core/meta/recipes-devtools/gcc/gcc-common.inc and build from scratch works without issues. I received reports of the same problem and I handed your fix to them, I'm waiting to hear back. regards, Koen ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-oe 1/1] toscoterm: add
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Otavio and I had an offline talk about this and I moved a better version of
this.
Op 23-02-12 16:49, Otavio Salvador schreef:
Signed-off-by: Otavio Salvador ota...@ossystems.com.br ---
meta-oe/recipes-support/toscoterm/toscoterm_git.bb | 26
1 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-support/toscoterm/toscoterm_git.bb
diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb new file mode
100644 index 000..d31b529 --- /dev/null +++
b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -0,0 +1,26 @@
+DESCRIPTION = A very small and simple terminal emulator +SECTION =
x11/applications +DEPENDS = vte +RDEPENDS += glibc-gconv-ibm437 +
+LICENSE = GPLv3 +LIC_FILES_CHKSUM =
file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa94530026bd15229
+
+# 0.2 version +SRCREV = 8586d617aed19fc75f5ae1e07270752c1b2f9a30
+SRC_URI = git://github.com/OSSystems/toscoterm.git + +S =
${WORKDIR}/git + +inherit gitpkgv pkgconfig + +do_compile() { +
oe_runmake \ +CC=${CC} \ + CFLAGS=`pkg-config
--cflags
vte`${CFLAGS} \ +LDFLAGS=`pkg-config --libs vte` ${LDFLAGS} +}
+
+do_install() { + oe_runmake PREFIX=/usr DESTDIR=${D} install +}
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk9GkfwACgkQMkyGM64RGpGgRACeOZFLeeHFvQvVa9Glt4ETQa/R
6l0AoJOvi8DB4lScBFOtu/XC13COJjId
=GzJD
-END PGP SIGNATURE-
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/3] meta-oe: include pointercal-xinput in SIGGEN_EXCLUDERECIPES_ABISAFE
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/conf/layer.conf |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 267616b..0a3a9ef 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -22,3 +22,5 @@ BBFILE_PATTERN_openembedded-layer := ^${LAYERDIR}/
# other layers.
BBFILE_PRIORITY_openembedded-layer = 6
+
+SIGGEN_EXCLUDERECIPES_ABISAFE += pointercal-xinput
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/3] mysql5: PR bump after including *_config in default SSTATE_SCAN_FILES
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-support/mysql/mysql5_5.1.40.inc |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
index ae1cf00..44de2a2 100644
--- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
+++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
@@ -5,7 +5,7 @@ LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa
DEPENDS = ncurses
-PR = r6
+PR = r7
SRC_URI = http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
file://configure.in.patch \
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/3] Small updates for sstate
The following changes since commit 3c50d83184d58eba36f72c7e2e7116d2a8e92a71: toscoterm: add (2012-02-23 17:57:04 +0100) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull Martin Jansa (3): mysql5: PR bump after including *_config in default SSTATE_SCAN_FILES meta-oe: include pointercal-xinput in SIGGEN_EXCLUDERECIPES_ABISAFE meta-oe: include systemd-serialgetty in SIGGEN_EXCLUDERECIPES_ABISAFE meta-oe/conf/layer.conf |2 ++ meta-oe/recipes-support/mysql/mysql5_5.1.40.inc |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) -- 1.7.8.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/3] meta-oe: include systemd-serialgetty in SIGGEN_EXCLUDERECIPES_ABISAFE
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/conf/layer.conf |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 0a3a9ef..cf13a71 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -23,4 +23,4 @@ BBFILE_PATTERN_openembedded-layer := ^${LAYERDIR}/
BBFILE_PRIORITY_openembedded-layer = 6
-SIGGEN_EXCLUDERECIPES_ABISAFE += pointercal-xinput
+SIGGEN_EXCLUDERECIPES_ABISAFE += pointercal-xinput systemd-serialgetty
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe] dhcp: follow oe-core's update to 4.2.3-P2
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...{dhcp_4.2.0.bbappend = dhcp_4.2.3-P2.bbappend} |0
1 files changed, 0 insertions(+), 0 deletions(-)
rename meta-oe/recipes-connectivity/dhcp/{dhcp_4.2.0.bbappend =
dhcp_4.2.3-P2.bbappend} (100%)
diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
similarity index 100%
rename from meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
rename to meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] dhcp: follow oe-core's update to 4.2.3-P2
On Thu, Feb 23, 2012 at 22:49, Andreas Müller schnitzelt...@googlemail.com wrote: rename from meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend rename to meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend Change PRINC back to + 1 plz. -- 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-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe V2] dhcp: follow oe-core's update to 4.2.3-P2
Signed-off-by: Andreas Müller schnitzelt...@googlemail.com
---
...{dhcp_4.2.0.bbappend = dhcp_4.2.3-P2.bbappend} |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename meta-oe/recipes-connectivity/dhcp/{dhcp_4.2.0.bbappend =
dhcp_4.2.3-P2.bbappend} (91%)
diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
similarity index 91%
rename from meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
rename to meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
index 6d1e3df..edd44c1 100644
--- a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
+++ b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
@@ -3,7 +3,7 @@ FILESEXTRAPATHS := ${THISDIR}/files
inherit systemd
-PRINC := ${@int(PRINC) + 3}
+PRINC := ${@int(PRINC) + 1}
SYSTEMD_PACKAGES = dhcp-server-systemd dhcp-relay-systemd
SYSTEMD_SERVICE_dhcp-server-systemd = dhcpd.service
--
1.7.4.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] udev-173: use tar.gz instead of git checkout
On Fri, Sep 9, 2011 at 9:03 AM, Martin Jansa martin.ja...@gmail.com wrote:
* today it's easier to find right tar.gz stored somewhere then working
git.kernel.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-core/udev/udev_173.bb | 9 -
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-core/udev/udev_173.bb
b/meta-oe/recipes-core/udev/udev_173.bb
index e1383d3..df39d42 100644
--- a/meta-oe/recipes-core/udev/udev_173.bb
+++ b/meta-oe/recipes-core/udev/udev_173.bb
@@ -16,11 +16,10 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
# Needed for udev-extras
DEPENDS = gperf-native usbutils acl glib-2.0
-SRCREV = ${PV}
PR = r0
# version specific SRC_URI
-SRC_URI = git://git.kernel.org/pub/scm/linux/hotplug/udev.git;protocol=git \
+SRC_URI = ${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
This tarball is no longer availabe... did they pull
'http://kernel.org/pub/linux/utils/kernel/hotplug/udev-173.tar.gz' for
some reason?
-M
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] udev-173: use tar.gz instead of git checkout
On Fri, Feb 24, 2012 at 04:27:42AM +, McClintock Matthew-B29882 wrote:
On Fri, Sep 9, 2011 at 9:03 AM, Martin Jansa martin.ja...@gmail.com wrote:
* today it's easier to find right tar.gz stored somewhere then working
git.kernel.org
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta-oe/recipes-core/udev/udev_173.bb | 9 -
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-core/udev/udev_173.bb
b/meta-oe/recipes-core/udev/udev_173.bb
index e1383d3..df39d42 100644
--- a/meta-oe/recipes-core/udev/udev_173.bb
+++ b/meta-oe/recipes-core/udev/udev_173.bb
@@ -16,11 +16,10 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
# Needed for udev-extras
DEPENDS = gperf-native usbutils acl glib-2.0
-SRCREV = ${PV}
PR = r0
# version specific SRC_URI
-SRC_URI =
git://git.kernel.org/pub/scm/linux/hotplug/udev.git;protocol=git \
+SRC_URI =
${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
This tarball is no longer availabe... did they pull
'http://kernel.org/pub/linux/utils/kernel/hotplug/udev-173.tar.gz' for
some reason?
I don't know.. I'm using 181 now..
Cheers,
-M
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/4] Small updates for sstate, added fix for kmod build
First 3 are the same, not resend Added small fix to disable man in kmod because we don't have working xsltproc The following changes since commit 3c50d83184d58eba36f72c7e2e7116d2a8e92a71: toscoterm: add (2012-02-23 17:57:04 +0100) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull Martin Jansa (4): mysql5: PR bump after including *_config in default SSTATE_SCAN_FILES meta-oe: include pointercal-xinput in SIGGEN_EXCLUDERECIPES_ABISAFE meta-oe: include systemd-serialgetty in SIGGEN_EXCLUDERECIPES_ABISAFE kmod: disable man pages generation because we don't have working xsltproc meta-oe/conf/layer.conf|2 + ...-man-page-generation-because-we-don-t-hav.patch | 26 meta-oe/recipes-kernel/kmod/kmod_git.bb|6 +++- meta-oe/recipes-support/mysql/mysql5_5.1.40.inc|2 +- 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch -- 1.7.8.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/4] kmod: disable man pages generation because we don't have working xsltproc
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
...-man-page-generation-because-we-don-t-hav.patch | 26
meta-oe/recipes-kernel/kmod/kmod_git.bb|6 +++-
2 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644
meta-oe/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
diff --git
a/meta-oe/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
b/meta-oe/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
new file mode 100644
index 000..5361b84
--- /dev/null
+++
b/meta-oe/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
@@ -0,0 +1,26 @@
+From ce6f0cabb65e67dd4d31e1e555db8bc6eaf435d3 Mon Sep 17 00:00:00 2001
+From: Martin Jansa martin.ja...@gmail.com
+Date: Fri, 24 Feb 2012 07:35:38 +0100
+Subject: [PATCH] man: disable man page generation because we don't have
+ working xsltproc
+
+Upstream-Status: Inappropriate [build system specific change]
+
+Signed-off-by: Martin Jansa martin.ja...@gmail.com
+---
+ Makefile.am |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 141c102..a8bdfd1 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . libkmod/docs man
++SUBDIRS = . libkmod/docs
+
+ DISTCLEAN_LOCAL_HOOKS =
+ EXTRA_DIST =
+--
+1.7.8.4
+
diff --git a/meta-oe/recipes-kernel/kmod/kmod_git.bb
b/meta-oe/recipes-kernel/kmod/kmod_git.bb
index 14c59a3..c382ffc 100644
--- a/meta-oe/recipes-kernel/kmod/kmod_git.bb
+++ b/meta-oe/recipes-kernel/kmod/kmod_git.bb
@@ -3,13 +3,15 @@ DESCRIPTION = kmod - handle kernel modules
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-PR = r1
+PR = r2
inherit autotools gitpkgv
PKGV = ${GITPKGVTAG}
SRCREV = 80e54cb675d08f4f81b093a1919465ea86110a3b
-SRC_URI = git://git.profusion.mobi/kmod.git
+SRC_URI = git://git.profusion.mobi/kmod.git \
+
file://0001-man-disable-man-page-generation-because-we-don-t-hav.patch \
+
S = ${WORKDIR}/git
--
1.7.8.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] libedit: Adds version 20110802 (initial recipe)
On (22/02/12 07:15), Ahsan, Noor wrote: Does this block my recipe to be accepted in meta-oe and by your comment below you are suggesting me to upstream that patch to libedit project? Well I am ok since it has something in there may be just change it to 'Pending' so that if someone later wants to upstream this patch he gets a right message and it does not hurt to get patches run via upstream in any case. -Original Message- From: openembedded-devel-boun...@lists.openembedded.org [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of Khem Raj Sent: Wednesday, February 22, 2012 2:12 AM To: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-oe][PATCH] libedit: Adds version 20110802 (initial recipe) On Tue, Feb 21, 2012 at 4:47 AM, Noor, Ahsan noor_ah...@mentor.com wrote: +Upstream-Status: Inappropriate [not author] hmm thats interesting. We can still push patches upstream with proper attribution to author. therefore this may not be a reason to make it Inappropriate. ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- -Khem ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
