* [meta-oe 1/7] systemd-systemctl-native: add multiple services support
@ 2012-02-11 1:59 Andreas Müller
2012-02-11 1:59 ` [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE Andreas Müller
` (6 more replies)
0 siblings, 7 replies; 36+ messages in thread
From: Andreas Müller @ 2012-02-11 1:59 UTC (permalink / raw)
To: openembedded-devel
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 <schnitzeltony@googlemail.com>
---
.../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.4.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
@ 2012-02-11 1:59 ` Andreas Müller
2012-02-11 13:09 ` Otavio Salvador
2012-02-11 1:59 ` [meta-oe 3/7] systemd.bbclass: cosmetics Andreas Müller
` (5 subsequent siblings)
6 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-11 1:59 UTC (permalink / raw)
To: openembedded-devel
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 <schnitzeltony@googlemail.com>
---
meta-oe/classes/systemd.bbclass | 43 +++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 094a12c..bc83908 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -25,9 +25,41 @@ 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():
+ # not for native / only at parse time
+ if d.getVar('BPN', 1) + "-native" != d.getVar('PN', 1) and d.getVar('BB_WORKERCONTEXT', True) is None:
+ 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)
@@ -70,11 +102,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.4.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [meta-oe 3/7] systemd.bbclass: cosmetics
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
2012-02-11 1:59 ` [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE Andreas Müller
@ 2012-02-11 1:59 ` Andreas Müller
2012-02-11 13:15 ` Otavio Salvador
2012-02-11 2:00 ` [meta-oe 4/7] systemd.bbclass: automatically create packages set in SYSTEMD_PACKAGES Andreas Müller
` (4 subsequent siblings)
6 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-11 1:59 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
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 bc83908..7ec4ca4 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -66,7 +66,7 @@ python __anonymous() {
}
python populate_packages_prepend () {
- def systemd_package(pkg):
+ def systemd_prepost_instrm(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)
@@ -90,10 +90,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 "")
@@ -101,7 +101,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_prepost_instrm(pkg_systemd)
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [meta-oe 4/7] systemd.bbclass: automatically create packages set in SYSTEMD_PACKAGES
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
2012-02-11 1:59 ` [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE Andreas Müller
2012-02-11 1:59 ` [meta-oe 3/7] systemd.bbclass: cosmetics Andreas Müller
@ 2012-02-11 2:00 ` Andreas Müller
2012-02-11 13:16 ` Otavio Salvador
2012-02-11 2:00 ` [meta-oe 5/7] automatically install all *.service and *.socket supplied in recipe's SRC_URI Andreas Müller
` (3 subsequent siblings)
6 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-11 2:00 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
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 7ec4ca4..ffcabe9 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -57,8 +57,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.4.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [meta-oe 5/7] automatically install all *.service and *.socket supplied in recipe's SRC_URI
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
` (2 preceding siblings ...)
2012-02-11 2:00 ` [meta-oe 4/7] systemd.bbclass: automatically create packages set in SYSTEMD_PACKAGES Andreas Müller
@ 2012-02-11 2:00 ` Andreas Müller
2012-02-11 13:17 ` Otavio Salvador
2012-02-11 2:00 ` [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages Andreas Müller
` (2 subsequent siblings)
6 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-11 2:00 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@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 ffcabe9..3c1ed14 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -74,6 +74,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}${base_libdir}/systemd/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}${base_libdir}/systemd/system
+ fi
+ done
+}
+
python populate_packages_prepend () {
def systemd_prepost_instrm(pkg):
bb.debug(1, 'adding systemd calls to postinst/postrm for %s' % pkg)
--
1.7.4.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
` (3 preceding siblings ...)
2012-02-11 2:00 ` [meta-oe 5/7] automatically install all *.service and *.socket supplied in recipe's SRC_URI Andreas Müller
@ 2012-02-11 2:00 ` Andreas Müller
2012-02-11 13:12 ` Otavio Salvador
2012-02-11 2:00 ` [meta-oe 7/7] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages Andreas Müller
2012-02-11 13:05 ` [meta-oe 1/7] systemd-systemctl-native: add multiple services support Otavio Salvador
6 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-11 2:00 UTC (permalink / raw)
To: openembedded-devel
In case SYSTEMD_SERVICE contains only one *.service file, the whole folder
${base_libdir}/systemd/system/ is added to FILES_* otherwise only the *.service
files found in SYSTEMD_SERVICE.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-oe/classes/systemd.bbclass | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 3c1ed14..8927980 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -120,7 +120,23 @@ python populate_packages_prepend () {
rdepends.append("systemd")
bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d)
+ # add systemd files to FILES_*-systemd
+ def systemd_add_files(pkg_systemd):
+ systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
+ files_append = ""
+ if len(systemd_services.split()) == 1:
+ # distribute complete ${base_libdir}/systemd/system/ to ${SYSTEMD_PACKAGES}
+ files_append = '${base_libdir}/systemd/system/'
+ else:
+ # distribute files set in SYSTEMD_SERVICE to ${SYSTEMD_PACKAGES}
+ for service in systemd_services.split():
+ files_append += ' ${base_libdir}/systemd/system/' + service
+
+ var_name = "FILES_" + pkg_systemd
+ files = d.getVar(var_name, 0) or ""
+ d.setVar(var_name, "%s %s" % (files, files_append))
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_prepost_instrm(pkg_systemd)
+ systemd_add_files(pkg_systemd)
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [meta-oe 7/7] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
` (4 preceding siblings ...)
2012-02-11 2:00 ` [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages Andreas Müller
@ 2012-02-11 2:00 ` Andreas Müller
2012-02-11 13:19 ` Otavio Salvador
2012-02-11 13:05 ` [meta-oe 1/7] systemd-systemctl-native: add multiple services support Otavio Salvador
6 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-11 2:00 UTC (permalink / raw)
To: openembedded-devel
* append systemd (functionalty moved into systemd_add_rdepends)
* append base-pgk
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-oe/classes/systemd.bbclass | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index 8927980..edc2872 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -116,10 +116,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 systemd files to FILES_*-systemd
def systemd_add_files(pkg_systemd):
systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
@@ -136,7 +132,22 @@ python populate_packages_prepend () {
files = d.getVar(var_name, 0) or ""
d.setVar(var_name, "%s %s" % (files, files_append))
+ # *-systemd packages get RDEPENDS to systemd and their base package
+ def systemd_add_rdepends(pkg_systemd):
+ pn_pkg = d.getVar('PN', 1)
+ # RDEPENDS_${pkg_systemd} += pkg_systemd_base systemd
+ rdepends = explode_deps(d.getVar('RDEPENDS_' + pkg_systemd, 1) or "")
+ if not 'systemd' in rdepends:
+ rdepends.append('systemd')
+ pkg_systemd_base = pkg_systemd.replace('-systemd', '')
+ # not rdepending myself / avoid double entries
+ if pkg_systemd != pn_pkg and not pkg_systemd_base in rdepends:
+ rdepends.append(pkg_systemd_base)
+ d.setVar('RDEPENDS_' + pkg_systemd, " " + " ".join(rdepends))
+
+
for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
systemd_prepost_instrm(pkg_systemd)
systemd_add_files(pkg_systemd)
+ systemd_add_rdepends(pkg_systemd)
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [meta-oe 1/7] systemd-systemctl-native: add multiple services support
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
` (5 preceding siblings ...)
2012-02-11 2:00 ` [meta-oe 7/7] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages Andreas Müller
@ 2012-02-11 13:05 ` Otavio Salvador
6 siblings, 0 replies; 36+ messages in thread
From: Otavio Salvador @ 2012-02-11 13:05 UTC (permalink / raw)
To: openembedded-devel
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
On Fri, Feb 10, 2012 at 23:59, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> 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 <schnitzeltony@googlemail.com>
> ---
> .../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.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE
2012-02-11 1:59 ` [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE Andreas Müller
@ 2012-02-11 13:09 ` Otavio Salvador
2012-02-12 21:51 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-11 13:09 UTC (permalink / raw)
To: openembedded-devel
On Fri, Feb 10, 2012 at 23:59, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> + def systemd_check_vars():
> + # not for native / only at parse time
>
Doesn't it need to take into account for cross and nativesdk too?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-11 2:00 ` [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages Andreas Müller
@ 2012-02-11 13:12 ` Otavio Salvador
2012-02-12 22:15 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-11 13:12 UTC (permalink / raw)
To: openembedded-devel
On Sat, Feb 11, 2012 at 00:00, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> In case SYSTEMD_SERVICE contains only one *.service file, the whole folder
> ${base_libdir}/systemd/system/ is added to FILES_* otherwise only the
> *.service
> files found in SYSTEMD_SERVICE.
>
It seems you'll need to parse the service file and check if it installs
others. For example .socket files usually do that. And then you'll never
add the whole dir automatically but dependently of the services it needs to
install.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 3/7] systemd.bbclass: cosmetics
2012-02-11 1:59 ` [meta-oe 3/7] systemd.bbclass: cosmetics Andreas Müller
@ 2012-02-11 13:15 ` Otavio Salvador
2012-02-12 21:53 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-11 13:15 UTC (permalink / raw)
To: openembedded-devel
On Fri, Feb 10, 2012 at 23:59, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> python populate_packages_prepend () {
> - def systemd_package(pkg):
> + def systemd_prepost_instrm(pkg):
>
I fully agree about renaming it but wouldn't
systemd_generate_package_scripts(pkg) be more descriptive?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 4/7] systemd.bbclass: automatically create packages set in SYSTEMD_PACKAGES
2012-02-11 2:00 ` [meta-oe 4/7] systemd.bbclass: automatically create packages set in SYSTEMD_PACKAGES Andreas Müller
@ 2012-02-11 13:16 ` Otavio Salvador
0 siblings, 0 replies; 36+ messages in thread
From: Otavio Salvador @ 2012-02-11 13:16 UTC (permalink / raw)
To: openembedded-devel
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
On Sat, Feb 11, 2012 at 00:00, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> 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 7ec4ca4..ffcabe9 100644
> --- a/meta-oe/classes/systemd.bbclass
> +++ b/meta-oe/classes/systemd.bbclass
> @@ -57,8 +57,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.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 5/7] automatically install all *.service and *.socket supplied in recipe's SRC_URI
2012-02-11 2:00 ` [meta-oe 5/7] automatically install all *.service and *.socket supplied in recipe's SRC_URI Andreas Müller
@ 2012-02-11 13:17 ` Otavio Salvador
0 siblings, 0 replies; 36+ messages in thread
From: Otavio Salvador @ 2012-02-11 13:17 UTC (permalink / raw)
To: openembedded-devel
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
On Sat, Feb 11, 2012 at 00:00, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
>
> Signed-off-by: Andreas Müller <schnitzeltony@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 ffcabe9..3c1ed14 100644
> --- a/meta-oe/classes/systemd.bbclass
> +++ b/meta-oe/classes/systemd.bbclass
> @@ -74,6 +74,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}${base_libdir}/systemd/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}${base_libdir}/systemd/system
> + fi
> + done
> +}
> +
> python populate_packages_prepend () {
> def systemd_prepost_instrm(pkg):
> bb.debug(1, 'adding systemd calls to postinst/postrm for
> %s' % pkg)
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 7/7] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages
2012-02-11 2:00 ` [meta-oe 7/7] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages Andreas Müller
@ 2012-02-11 13:19 ` Otavio Salvador
2012-02-12 22:16 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-11 13:19 UTC (permalink / raw)
To: openembedded-devel
On Sat, Feb 11, 2012 at 00:00, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> * append systemd (functionalty moved into systemd_add_rdepends)
> * append base-pgk
>
This patch is OK but I think it would be nice if the recipe has it included
in rdepends byhand we could do a warning saying it's use is deprecated so
we can know about it and cleanup the recipes.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE
2012-02-11 13:09 ` Otavio Salvador
@ 2012-02-12 21:51 ` Andreas Müller
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Müller @ 2012-02-12 21:51 UTC (permalink / raw)
To: openembedded-devel
On Sat, Feb 11, 2012 at 2:09 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Fri, Feb 10, 2012 at 23:59, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> + def systemd_check_vars():
>> + # not for native / only at parse time
>>
>
> Doesn't it need to take into account for cross and nativesdk too?
>
Currently there is no case for this. Since I see no harm adding cross
and nativesdk I will extend in V2.
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 3/7] systemd.bbclass: cosmetics
2012-02-11 13:15 ` Otavio Salvador
@ 2012-02-12 21:53 ` Andreas Müller
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Müller @ 2012-02-12 21:53 UTC (permalink / raw)
To: openembedded-devel
On Sat, Feb 11, 2012 at 2:15 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Fri, Feb 10, 2012 at 23:59, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> python populate_packages_prepend () {
>> - def systemd_package(pkg):
>> + def systemd_prepost_instrm(pkg):
>>
>
> I fully agree about renaming it but wouldn't
> systemd_generate_package_scripts(pkg) be more descriptive?
>
V2 will get that
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-11 13:12 ` Otavio Salvador
@ 2012-02-12 22:15 ` Andreas Müller
2012-02-13 10:42 ` Otavio Salvador
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-12 22:15 UTC (permalink / raw)
To: openembedded-devel
On Sat, Feb 11, 2012 at 2:12 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Sat, Feb 11, 2012 at 00:00, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> In case SYSTEMD_SERVICE contains only one *.service file, the whole folder
>> ${base_libdir}/systemd/system/ is added to FILES_* otherwise only the
>> *.service
>> files found in SYSTEMD_SERVICE.
>>
Off topic: My intention was to install the whole directory for recipes
with one service per package AND one *-systemd package (this case is
not catched by my code - so there will be a V2)
>
> It seems you'll need to parse the service file and check if it installs
> others. For example .socket files usually do that. And then you'll never
> add the whole dir automatically but dependently of the services it needs to
> install.
>
I am afraid this goes a bit to far and causes confusion what is
packed. I would prefer the simple rule:
If there is one *-systemd package with one entry in SYSTEMD_SERVICE,
the whole directory is installed - otherwise only the files found in
SYSTEMD_SERVICE. If a recipe installs too much or something is
missing, it can be corrected in recipe.
What is common opinion here?
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 7/7] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages
2012-02-11 13:19 ` Otavio Salvador
@ 2012-02-12 22:16 ` Andreas Müller
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Müller @ 2012-02-12 22:16 UTC (permalink / raw)
To: openembedded-devel
On Sat, Feb 11, 2012 at 2:19 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Sat, Feb 11, 2012 at 00:00, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> * append systemd (functionalty moved into systemd_add_rdepends)
>> * append base-pgk
>>
>
> This patch is OK but I think it would be nice if the recipe has it included
> in rdepends byhand we could do a warning saying it's use is deprecated so
> we can know about it and cleanup the recipes.
>
good suggestion - V2 will have it
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-12 22:15 ` Andreas Müller
@ 2012-02-13 10:42 ` Otavio Salvador
2012-02-13 12:05 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-13 10:42 UTC (permalink / raw)
To: openembedded-devel
On Sun, Feb 12, 2012 at 20:15, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> If there is one *-systemd package with one entry in SYSTEMD_SERVICE,
> the whole directory is installed - otherwise only the files found in
> SYSTEMD_SERVICE. If a recipe installs too much or something is
> missing, it can be corrected in recipe.
>
If for example I put two .socket files, your algorithm will break. That's
why I said you need to parse it. It is not that difficult as the logic is
the same as the wrapper used in rootfs generation.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-13 10:42 ` Otavio Salvador
@ 2012-02-13 12:05 ` Andreas Müller
2012-02-13 12:14 ` Otavio Salvador
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-13 12:05 UTC (permalink / raw)
To: openembedded-devel
On Mon, Feb 13, 2012 at 11:42 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Sun, Feb 12, 2012 at 20:15, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> If there is one *-systemd package with one entry in SYSTEMD_SERVICE,
>> the whole directory is installed - otherwise only the files found in
>> SYSTEMD_SERVICE. If a recipe installs too much or something is
>> missing, it can be corrected in recipe.
>>
>
> If for example I put two .socket files, your algorithm will break. That's
> why I said you need to parse it. It is not that difficult as the logic is
> the same as the wrapper used in rootfs generation.
Sorry - but which which wrapper do you mean?
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-13 12:05 ` Andreas Müller
@ 2012-02-13 12:14 ` Otavio Salvador
2012-02-13 16:38 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-13 12:14 UTC (permalink / raw)
To: openembedded-devel
On Mon, Feb 13, 2012 at 10:05, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> > If for example I put two .socket files, your algorithm will break. That's
> > why I said you need to parse it. It is not that difficult as the logic is
> > the same as the wrapper used in rootfs generation.
> Sorry - but which which wrapper do you mean?
systemd-systemctl-native
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-13 12:14 ` Otavio Salvador
@ 2012-02-13 16:38 ` Andreas Müller
2012-02-13 17:09 ` Otavio Salvador
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-13 16:38 UTC (permalink / raw)
To: openembedded-devel
On Mon, Feb 13, 2012 at 1:14 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Feb 13, 2012 at 10:05, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> > If for example I put two .socket files, your algorithm will break. That's
>> > why I said you need to parse it. It is not that difficult as the logic is
>> > the same as the wrapper used in rootfs generation.
>> Sorry - but which which wrapper do you mean?
>
>
> systemd-systemctl-native
Off list @Otavio: not boring but challenging...
To reuse as much as possible: Is there a piece of code showing me how
to mix up shell/python code?
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-13 16:38 ` Andreas Müller
@ 2012-02-13 17:09 ` Otavio Salvador
2012-02-14 12:42 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-13 17:09 UTC (permalink / raw)
To: openembedded-devel
On Mon, Feb 13, 2012 at 14:38, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> > systemd-systemctl-native
> Off list @Otavio: not boring but challenging...
>
> To reuse as much as possible: Is there a piece of code showing me how
> to mix up shell/python code?
Not that I am aware of but you can look at combo-layer script how to read
and parse ini files; this ought to be very simple to do.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-13 17:09 ` Otavio Salvador
@ 2012-02-14 12:42 ` Andreas Müller
2012-02-14 12:51 ` Otavio Salvador
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-14 12:42 UTC (permalink / raw)
To: openembedded-devel
On Mon, Feb 13, 2012 at 6:09 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Feb 13, 2012 at 14:38, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> > systemd-systemctl-native
>> Off list @Otavio: not boring but challenging...
>>
>> To reuse as much as possible: Is there a piece of code showing me how
>> to mix up shell/python code?
>
>
> Not that I am aware of but you can look at combo-layer script how to read
> and parse ini files; this ought to be very simple to do.
>
Currently I am testing the automatic parsing for different recipes.
Following the 'After=' and 'WantedBy=' works fine but before sending
out I would like to get some comments on the following
assumptions/questions:
* There is no need for recipes to install links for 'WantedBy' entries
since systemd-systemctl-native takes care. E.G the code in
lightttpd_1.4.30.bbappend for this can be removed (it works on the
wrong paths anyway) -> there is no need for systemd.bbclass to follow
'WantedBy'. Correct?
* For dropbear_2011.54.bbappend, the automatic parsing leaves
dropbear@.service and dropbear.service ( link to /dev/null ) unpacked.
In dropbear.socket there is 'Conflicts=dropbear.service'. Shall the
algorithm follow also services linked by Conflicts= and pack those
service files?
* dropbear_2011.54.bbappend: Is dropbear@.service a candidate for a
second *-systemd packet?
* are there other keys which might need follow-up too?
Thanks in advance
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-14 12:42 ` Andreas Müller
@ 2012-02-14 12:51 ` Otavio Salvador
2012-02-14 16:09 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-14 12:51 UTC (permalink / raw)
To: openembedded-devel
On Tue, Feb 14, 2012 at 10:42, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> Currently I am testing the automatic parsing for different recipes.
> Following the 'After=' and 'WantedBy=' works fine but before sending
> out I would like to get some comments on the following
> assumptions/questions:
>
> * There is no need for recipes to install links for 'WantedBy' entries
> since systemd-systemctl-native takes care. E.G the code in
> lightttpd_1.4.30.bbappend for this can be removed (it works on the
> wrong paths anyway) -> there is no need for systemd.bbclass to follow
> 'WantedBy'. Correct?
>
Links ought to be kept to be handled by systemd-systemctl-native.
> * For dropbear_2011.54.bbappend, the automatic parsing leaves
> dropbear@.service and dropbear.service ( link to /dev/null ) unpacked.
> In dropbear.socket there is 'Conflicts=dropbear.service'. Shall the
> algorithm follow also services linked by Conflicts= and pack those
> service files?
>
The /dev/null link is to force disable the init script. This is difficult
to do automatically so for now I'd say to do it byhand.
> * dropbear_2011.54.bbappend: Is dropbear@.service a candidate for a
> second *-systemd packet?
>
No; The @ is to allow multiple instance. Look at
http://www.freedesktop.org/software/systemd/man/systemd.unit.html
> * are there other keys which might need follow-up too?
>
Not that I am aware of at this moment.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-14 12:51 ` Otavio Salvador
@ 2012-02-14 16:09 ` Andreas Müller
2012-02-14 16:22 ` Otavio Salvador
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-14 16:09 UTC (permalink / raw)
To: openembedded-devel
On Tue, Feb 14, 2012 at 1:51 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> No; The @ is to allow multiple instance. Look at
> http://www.freedesktop.org/software/systemd/man/systemd.unit.html
How about the old strategy for *@.service:
If there is only one *-systemd package with one entry in
SYSTEMD_SERVICE it will get *@.service?
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-14 16:09 ` Andreas Müller
@ 2012-02-14 16:22 ` Otavio Salvador
2012-02-15 12:31 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-14 16:22 UTC (permalink / raw)
To: openembedded-devel
On Tue, Feb 14, 2012 at 14:09, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> On Tue, Feb 14, 2012 at 1:51 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
> > No; The @ is to allow multiple instance. Look at
> > http://www.freedesktop.org/software/systemd/man/systemd.unit.html
> How about the old strategy for *@.service:
> If there is only one *-systemd package with one entry in
> SYSTEMD_SERVICE it will get *@.service?
I think so.
It is not easy to predict all possible usages but we ought to take this
route and adjust it one the way. Once you do it and we start converting all
recipes that use systemd class in meta-oe we'll most probably find many
possible corner-cases to deal with.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-14 16:22 ` Otavio Salvador
@ 2012-02-15 12:31 ` Andreas Müller
2012-02-15 12:36 ` Otavio Salvador
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-15 12:31 UTC (permalink / raw)
To: openembedded-devel
On Tue, Feb 14, 2012 at 5:22 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Tue, Feb 14, 2012 at 14:09, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> On Tue, Feb 14, 2012 at 1:51 PM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>> > No; The @ is to allow multiple instance. Look at
>> > http://www.freedesktop.org/software/systemd/man/systemd.unit.html
>> How about the old strategy for *@.service:
>> If there is only one *-systemd package with one entry in
>> SYSTEMD_SERVICE it will get *@.service?
>
>
> I think so.
>
> It is not easy to predict all possible usages but we ought to take this
> route and adjust it one the way. Once you do it and we start converting all
> recipes that use systemd class in meta-oe we'll most probably find many
> possible corner-cases to deal with.
>
Another corner case I would like to understand: What is the role of in
busybox syslog.service linking to dev/null. Within busybox itself it
seems not referenced.
Thanks in advance
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 12:31 ` Andreas Müller
@ 2012-02-15 12:36 ` Otavio Salvador
2012-02-15 19:53 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Otavio Salvador @ 2012-02-15 12:36 UTC (permalink / raw)
To: openembedded-devel
On Wed, Feb 15, 2012 at 10:31, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> Another corner case I would like to understand: What is the role of in
> busybox syslog.service linking to dev/null. Within busybox itself it
> seems not referenced.
>
To make it to use the .service file and not the init scripts compatibility.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 12:36 ` Otavio Salvador
@ 2012-02-15 19:53 ` Andreas Müller
2012-02-15 19:55 ` Otavio Salvador
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-15 19:53 UTC (permalink / raw)
To: openembedded-devel
On Wed, Feb 15, 2012 at 1:36 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Wed, Feb 15, 2012 at 10:31, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> Another corner case I would like to understand: What is the role of in
>> busybox syslog.service linking to dev/null. Within busybox itself it
>> seems not referenced.
>>
>
> To make it to use the .service file and not the init scripts compatibility.
>
For test I did with a bunch of recipes
1. build from scratch with unmodified sources
2. Applied sytemd-patches and the 'cleanup'-patches (removing obsolete
systemd code in recipes)
3. build recipes again
4. compared the results with buildhistory
Results are as expected except one issue I don't understand:
The sizes of the *-dbg packages are reduced. Some reduce to less than
half. Has anybody a good explanation for this?
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 19:53 ` Andreas Müller
@ 2012-02-15 19:55 ` Otavio Salvador
2012-02-15 20:05 ` Martin Jansa
2012-02-15 20:07 ` Andreas Müller
0 siblings, 2 replies; 36+ messages in thread
From: Otavio Salvador @ 2012-02-15 19:55 UTC (permalink / raw)
To: openembedded-devel
On Wed, Feb 15, 2012 at 17:53, Andreas Müller
<schnitzeltony@googlemail.com>wrote:
> For test I did with a bunch of recipes
>
> 1. build from scratch with unmodified sources
> 2. Applied sytemd-patches and the 'cleanup'-patches (removing obsolete
> systemd code in recipes)
> 3. build recipes again
> 4. compared the results with buildhistory
>
> Results are as expected except one issue I don't understand:
>
> The sizes of the *-dbg packages are reduced. Some reduce to less than
> half. Has anybody a good explanation for this?
No good guess about possible reasoning.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 19:55 ` Otavio Salvador
@ 2012-02-15 20:05 ` Martin Jansa
2012-02-15 20:07 ` Andreas Müller
1 sibling, 0 replies; 36+ messages in thread
From: Martin Jansa @ 2012-02-15 20:05 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 917 bytes --]
On Wed, Feb 15, 2012 at 05:55:56PM -0200, Otavio Salvador wrote:
> On Wed, Feb 15, 2012 at 17:53, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
> > For test I did with a bunch of recipes
> >
> > 1. build from scratch with unmodified sources
> > 2. Applied sytemd-patches and the 'cleanup'-patches (removing obsolete
> > systemd code in recipes)
> > 3. build recipes again
> > 4. compared the results with buildhistory
> >
> > Results are as expected except one issue I don't understand:
> >
> > The sizes of the *-dbg packages are reduced. Some reduce to less than
> > half. Has anybody a good explanation for this?
>
>
> No good guess about possible reasoning.
Just guess:
-dbg packages contain also sources packaged for /usr/src/debug/, maybe
your changes caused *.service files to be ommited from it?
Cheers,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 19:55 ` Otavio Salvador
2012-02-15 20:05 ` Martin Jansa
@ 2012-02-15 20:07 ` Andreas Müller
2012-02-15 20:18 ` Andreas Müller
1 sibling, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-15 20:07 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 938 bytes --]
On Wed, Feb 15, 2012 at 8:55 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Wed, Feb 15, 2012 at 17:53, Andreas Müller
> <schnitzeltony@googlemail.com>wrote:
>
>> For test I did with a bunch of recipes
>>
>> 1. build from scratch with unmodified sources
>> 2. Applied sytemd-patches and the 'cleanup'-patches (removing obsolete
>> systemd code in recipes)
>> 3. build recipes again
>> 4. compared the results with buildhistory
>>
>> Results are as expected except one issue I don't understand:
>>
>> The sizes of the *-dbg packages are reduced. Some reduce to less than
>> half. Has anybody a good explanation for this?
>
>
> No good guess about possible reasoning.
>
I did further checks: seems many many source code files are missing
(example - see attachment). Strange is that the value for FILES has
not changed! What have done to cause that - or is this unrelated to
my modifications?
Andreas
[-- Attachment #2: test --]
[-- Type: application/octet-stream, Size: 12171 bytes --]
commit 1b11ec57955b9cb1ccc7f0f91c5d225114809eb2
Author: buildhistory <buildhistory@angstrom>
Date: Wed Feb 15 20:06:32 2012 +0100
Build Angstrom v2012.02-core of angstrom v2012.02-core for machine overo on unknown
diff --git a/packages/armv7a-angstrom-linux-gnueabi/openssh/openssh-dbg/latest b/packages/armv7a-angstrom-linux-gnueabi/openssh/openssh-dbg/latest
index ae2353e..32e477b 100644
--- a/packages/armv7a-angstrom-linux-gnueabi/openssh/openssh-dbg/latest
+++ b/packages/armv7a-angstrom-linux-gnueabi/openssh/openssh-dbg/latest
@@ -1,7 +1,7 @@
PV = 5.9p1
-PR = r4
+PR = r5
RDEPENDS =
-RRECOMMENDS = systemd-dbg shadow-dbg base-passwd-dbg zlib-dbg update-rc.d-dbg openssh (= 5.9p1-r4) libpam-dbg openssh-ssh-dbg openssh-scp-dbg openssh-keygen-dbg libcrypto-dbg eglibc-dbg openssh-sshd-dbg openssh-dbg
-PKGSIZE = 7146375
+RRECOMMENDS = systemd-dbg shadow-dbg base-passwd-dbg zlib-dbg update-rc.d-dbg openssh (= 5.9p1-r5) libpam-dbg openssh-ssh-dbg openssh-scp-dbg openssh-keygen-dbg libcrypto-dbg eglibc-dbg openssh-sshd-dbg openssh-dbg
+PKGSIZE = 5007331
FILES = /usr/bin/.debug /usr/sbin/.debug /usr/libexec/.debug /usr/lib/.debug /bin/.debug /sbin/.debug /lib/.debug /usr/lib/openssh/.debug /usr/lib/matchbox-panel/.debug /usr/src/debug
-FILELIST = /usr/bin/.debug/scp.openssh /usr/bin/.debug/ssh-keygen /usr/bin/.debug/ssh-add /usr/bin/.debug/ssh-keyscan /usr/bin/.debug/sftp /usr/bin/.debug/ssh.openssh /usr/bin/.debug/ssh-agent /usr/sbin/.debug/sshd /usr/libexec/.debug/sftp-server /usr/libexec/.debug/ssh-pkcs11-helper /usr/libexec/.debug/ssh-keysign /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshd.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshconnect.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-add.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/misc.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/dispatch.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp-client.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/rsa.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexgexs.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/bufec.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexdhs.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexgexc.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/servconf.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshtty.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/scp.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/dispatch.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-keysign.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/monitor_mm.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/dh.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-pkcs11-helper.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/authfd.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/cipher.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/servconf.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-rsa.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/hostfile.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshconnect1.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/clientloop.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-options.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp-server-main.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/fatal.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/readpass.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kex.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/roaming_common.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/readconf.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshconnect2.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/hostfile.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/progressmeter.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/platform.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/loginrec.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth2-chall.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/atomicio.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-pkcs11-client.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/session.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/authfd.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/roaming_client.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth2.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/dns.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/log.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/compress.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/clientloop.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-keygen.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/myproposal.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth2-passwd.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/monitor_wrap.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/deattack.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/bufbn.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/authfile.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/entropy.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/roaming_serv.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/buffer.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/monitor_mm.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/nchan.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/bufaux.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-options.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/uidswap.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexecdh.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-pam.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexdhc.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp-common.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-keyscan.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth2-none.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp-common.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/key.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/buffer.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-passwd.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ttymodes.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/moduli.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/compat.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexgex.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/cipher-acss.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshconnect.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/cipher-ctr.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-rsa.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth2-pubkey.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth2-kbdint.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/dns.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/xmalloc.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp-client.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/key.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/cipher.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/monitor.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/dh.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/groupaccess.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/serverloop.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshpty.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/umac.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth1.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/session.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-agent.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/crc32.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/channels.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sshlogin.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/cleanup.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/cipher-bf1.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp-glob.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/acss.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/msg.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sandbox-rlimit.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/mac.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-chall.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/monitor_wrap.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-dss.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexecdhs.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-ecdsa.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/canohost.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/channels.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ssh-pkcs11.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/uuencode.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-rhosts.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kex.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth2-hostbased.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/ttymodes.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/mux.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/acss.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/pkcs11.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/packet.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/misc.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/loginrec.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/roaming.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/readconf.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/roaming_dummy.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/compat.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/addrmatch.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-rh-rsa.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/sftp-server.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexdh.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/auth-shadow.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/kexecdhc.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/log.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/monitor_fdpass.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/match.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/monitor.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/cipher-3des1.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/setproctitle.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/bsd-closefrom.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/vis.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/charclass.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/bsd-misc.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/port-tun.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/strlcat.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/pwcache.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/fmt_scaled.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/readpassphrase.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/getrrsetbyname.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/bsd-misc.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/base64.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/getrrsetbyname.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/strtonum.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/bsd-arc4random.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/xcrypt.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/glob.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/xmmap.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/glob.h /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/mktemp.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/strmode.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/port-linux.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/getopt.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/bsd-getpeereid.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/strlcpy.c /usr/src/debug/openssh-5.9p1-r4/openssh-5.9p1/openbsd-compat/timingsafe_bcmp.c
+FILELIST = /usr/bin/.debug/scp.openssh /usr/bin/.debug/ssh-keygen /usr/bin/.debug/ssh-add /usr/bin/.debug/ssh-keyscan /usr/bin/.debug/sftp /usr/bin/.debug/ssh.openssh /usr/bin/.debug/ssh-agent /usr/sbin/.debug/sshd /usr/libexec/.debug/sftp-server /usr/libexec/.debug/ssh-pkcs11-helper /usr/libexec/.debug/ssh-keysign
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 20:07 ` Andreas Müller
@ 2012-02-15 20:18 ` Andreas Müller
2012-02-15 20:39 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-15 20:18 UTC (permalink / raw)
To: openembedded-devel
On Wed, Feb 15, 2012 at 9:07 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Wed, Feb 15, 2012 at 8:55 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> On Wed, Feb 15, 2012 at 17:53, Andreas Müller
>> <schnitzeltony@googlemail.com>wrote:
>>
>>> For test I did with a bunch of recipes
>>>
>>> 1. build from scratch with unmodified sources
>>> 2. Applied sytemd-patches and the 'cleanup'-patches (removing obsolete
>>> systemd code in recipes)
>>> 3. build recipes again
>>> 4. compared the results with buildhistory
>>>
>>> Results are as expected except one issue I don't understand:
>>>
>>> The sizes of the *-dbg packages are reduced. Some reduce to less than
>>> half. Has anybody a good explanation for this?
>>
>>
>> No good guess about possible reasoning.
>>
> I did further checks: seems many many source code files are missing
> (example - see attachment). Strange is that the value for FILES has
> not changed! What have done to cause that - or is this unrelated to
> my modifications?
>
*All* source files are missing. Which part of oe is responsible, packing these?
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 20:18 ` Andreas Müller
@ 2012-02-15 20:39 ` Andreas Müller
2012-02-15 21:00 ` Andreas Müller
0 siblings, 1 reply; 36+ messages in thread
From: Andreas Müller @ 2012-02-15 20:39 UTC (permalink / raw)
To: openembedded-devel
On Wed, Feb 15, 2012 at 9:18 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Wed, Feb 15, 2012 at 9:07 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> On Wed, Feb 15, 2012 at 8:55 PM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>> On Wed, Feb 15, 2012 at 17:53, Andreas Müller
>>> <schnitzeltony@googlemail.com>wrote:
>>>
>>>> For test I did with a bunch of recipes
>>>>
>>>> 1. build from scratch with unmodified sources
>>>> 2. Applied sytemd-patches and the 'cleanup'-patches (removing obsolete
>>>> systemd code in recipes)
>>>> 3. build recipes again
>>>> 4. compared the results with buildhistory
>>>>
>>>> Results are as expected except one issue I don't understand:
>>>>
>>>> The sizes of the *-dbg packages are reduced. Some reduce to less than
>>>> half. Has anybody a good explanation for this?
>>>
>>>
>>> No good guess about possible reasoning.
>>>
>> I did further checks: seems many many source code files are missing
>> (example - see attachment). Strange is that the value for FILES has
>> not changed! What have done to cause that - or is this unrelated to
>> my modifications?
>>
> *All* source files are missing. Which part of oe is responsible, packing these?
>
OK I think this one unrelated to my changes. I did
* undo my patches
* bumped PR for poppler ( this one has no systemd 'contact' )
* build poppler
and for the bumped package
<..>/package/src/debug/
is empty!
Could somebody of you please do same and confirm?
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages
2012-02-15 20:39 ` Andreas Müller
@ 2012-02-15 21:00 ` Andreas Müller
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Müller @ 2012-02-15 21:00 UTC (permalink / raw)
To: openembedded-devel
On Wed, Feb 15, 2012 at 9:39 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> <..>/package/src/debug/
of course this must be
<..>/package/usr/src/debug/
started a build from scratch with systemd patches...
Andreas
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2012-02-15 21:08 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-11 1:59 [meta-oe 1/7] systemd-systemctl-native: add multiple services support Andreas Müller
2012-02-11 1:59 ` [meta-oe 2/7] systemd.bbclass: enhance checks for SYSTEMD_PACKAGES and SYSTEMD_SERVICE Andreas Müller
2012-02-11 13:09 ` Otavio Salvador
2012-02-12 21:51 ` Andreas Müller
2012-02-11 1:59 ` [meta-oe 3/7] systemd.bbclass: cosmetics Andreas Müller
2012-02-11 13:15 ` Otavio Salvador
2012-02-12 21:53 ` Andreas Müller
2012-02-11 2:00 ` [meta-oe 4/7] systemd.bbclass: automatically create packages set in SYSTEMD_PACKAGES Andreas Müller
2012-02-11 13:16 ` Otavio Salvador
2012-02-11 2:00 ` [meta-oe 5/7] automatically install all *.service and *.socket supplied in recipe's SRC_URI Andreas Müller
2012-02-11 13:17 ` Otavio Salvador
2012-02-11 2:00 ` [meta-oe 6/7] systemd.bbclass: automatically extend FILES_* for systemd packages Andreas Müller
2012-02-11 13:12 ` Otavio Salvador
2012-02-12 22:15 ` Andreas Müller
2012-02-13 10:42 ` Otavio Salvador
2012-02-13 12:05 ` Andreas Müller
2012-02-13 12:14 ` Otavio Salvador
2012-02-13 16:38 ` Andreas Müller
2012-02-13 17:09 ` Otavio Salvador
2012-02-14 12:42 ` Andreas Müller
2012-02-14 12:51 ` Otavio Salvador
2012-02-14 16:09 ` Andreas Müller
2012-02-14 16:22 ` Otavio Salvador
2012-02-15 12:31 ` Andreas Müller
2012-02-15 12:36 ` Otavio Salvador
2012-02-15 19:53 ` Andreas Müller
2012-02-15 19:55 ` Otavio Salvador
2012-02-15 20:05 ` Martin Jansa
2012-02-15 20:07 ` Andreas Müller
2012-02-15 20:18 ` Andreas Müller
2012-02-15 20:39 ` Andreas Müller
2012-02-15 21:00 ` Andreas Müller
2012-02-11 2:00 ` [meta-oe 7/7] systemd.bbclass: automatically extend RDEPENDS for *-systemd packages Andreas Müller
2012-02-11 13:19 ` Otavio Salvador
2012-02-12 22:16 ` Andreas Müller
2012-02-11 13:05 ` [meta-oe 1/7] systemd-systemctl-native: add multiple services support Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.