Commit Graph

40 Commits

Author SHA1 Message Date
Martin Jansa
a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Martin Jansa
9e192db23a busybox: fix upgrade path
* check_data_file_clashes: Package busybox-syslog wants to install file /lib/systemd/system/busybox-syslog.service
        But that file is already provided by package  * busybox-syslog-systemd
 * check_data_file_clashes: Package busybox-syslog wants to install file /lib/systemd/system/syslog.service
        But that file is already provided by package  * busybox-syslog-systemd
 * check_data_file_clashes: Package busybox-syslog wants to install file /lib/systemd/system/busybox-klogd.service
        But that file is already provided by package  * busybox-syslog-systemd

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:07 +02:00
Martin Jansa
65401d4785 dbus: add bbappend to fix upgrade path
* check_data_file_clashes: Package dbus-1 wants to install file /lib/systemd/system/multi-user.target.wants/dbus.service
        But that file is already provided by package  * dbus-systemd
 * check_data_file_clashes: Package dbus-1 wants to install file /lib/systemd/system/dbus.socket
        But that file is already provided by package  * dbus-systemd
 * check_data_file_clashes: Package dbus-1 wants to install file /lib/systemd/system/sockets.target.wants/dbus.socket
        But that file is already provided by package  * dbus-systemd

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:06 +02:00
Martin Jansa
b4cb81b1c9 systemd: add .bbappend to fix upgrade-path
* check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sysinit.target.wants/systemd-udevd.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udevd.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udev-settle.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udev-trigger.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sockets.target.wants/systemd-udevd-control.socket
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sockets.target.wants/systemd-udevd-kernel.socket
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udevd-control.socket
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udevd-kernel.socket
        But that file is already provided by package  * udev-systemd

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:06 +02:00
Martin Jansa
7baa466291 at: move bbappend to oe-core subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:02 +02:00
Martin Jansa
c39daf6e36 rpcbind: move bbappend to oe-core subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:02 +02:00
Martin Jansa
a67fc4b8a3 busybox: move bbappend to oe-core subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:02 +02:00
Martin Jansa
1fb0eacf03 dropbear: move bbappend to oe-core subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:02 +02:00
Martin Jansa
7be95a25e0 keymaps: move bbappend to oe-core subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:02 +02:00
Martin Jansa
6ac7306132 openssh: fix warnings about overwritting keys
* they were causing real issues like openssh-sshd-systemd not really RPROVIDED..
  WARNING: Variable key RCONFLICTS_${PN}-sshd (dropbear) replaces original key RCONFLICTS_openssh-sshd ( openssh-sshd-systemd).
  WARNING: Variable key FILES_${PN}-sshd (${sbindir}/sshd ${sysconfdir}/init.d/sshd ${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config) replaces original key FILES_openssh-sshd ( ${systemd_unitdir}/system/sshd.socket).
  WARNING: Variable key RPROVIDES_${PN}-sshd (sshd) replaces original key RPROVIDES_openssh-sshd ( openssh-sshd-systemd).

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:16:51 +02:00
Martin Jansa
739fc97599 meta-systemd: Add not only RPROVIDES, but also RREPLACES/RCONFLICTS
with this combo opkg should automatically remove PN-systemd and replace it with PN
2013-04-12 18:50:16 +02:00
Martin Jansa
1482cfe735 meta-systemd: bump PRINC in all .bbappends
* opkg upgrade will fail to upgrade every package PN when PN-system is installed
  * check_data_file_clashes: Package xserver-nodm-init wants to install file /lib/systemd/system/xserver-nodm.service
    But that file is already provided by package  * xserver-nodm-init-systemd
  You need to manually remove all PN-systemd packages on your target
  opkg remove -force-depends -force-remove `opkg list-installed | grep "\-systemd"`
  be careful with stuff like openssh-sshd-systemd or
  wpa-supplicant-systemd when you have access to target only over
  network
* this PRINC bump will force you to do it now even for people not using
  OEBasicHash or PR service

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-12 18:50:15 +02:00
Martin Jansa
f195081bd0 meta-systemd: move cronie to oe-core subdirectory 2013-04-12 18:50:15 +02:00
Martin Jansa
a179ca25a4 meta-systemd: drop default SYSTEMD_PACKAGES = "${PN}" 2013-04-12 18:50:15 +02:00
Khem Raj
313f0ae259 meta-systemd: Append ${PN} to SYSTEMD_SERVICE
When using systemd class from OE-Core we also need
to install the units explicitly.

systemd packages ending with -systemd are consumed
and now provided by package proper.

MJ: fix RPROVIDES_PN = PN-systemd in entrance
MJ: add RPROVIDES for ntp*-systemd in ntp
MJ: the same for wpa-supplicant

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-12 18:49:55 +02:00
Jukka Rissanen
f423ccb8a7 wpa_supplicant: Location of systemd services files changed
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-03-18 16:31:32 +01:00
Martin Jansa
ef4f712280 connman: rename .bbappend to match new version from oe-core
* drop settings already set in connman.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-03-12 11:22:40 +01:00
Martin Jansa
8c8a576565 meta-systemd: restore wpa-supplicant bbappend
* systemd support in oe-core does not work for everybody

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-03-05 14:38:06 +01:00
Martin Jansa
ce25b8d24c meta-systemd: openssh: rename bbappend to match oe-core version 6.1p1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-28 18:01:59 +01:00
Andreas Müller
6edc76eb7b util-linux: follow oe-core to 2.22.2
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2013-01-28 15:40:39 +01:00
Andreas Müller
b9bd40a506 dhcp: follow oe-core to 4.2.5
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2013-01-28 15:40:39 +01:00
Martin Jansa
2389147d10 meta-systemd: remove wpa-supplicant bbappend
* oe-core now has wpa-supplicant 2.0, but also installs wpa_supplicant.service to PN
* feel free to add new bbappend with only systemd inherit and updated SYSTEMD_PACKAGES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-27 22:35:43 +01:00
Martin Jansa
13be4a07ec meta-systemd: connman, openssh: move bbappends to oe-core dir
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-17 14:22:11 +01:00
Andrei Gherzan
2dbefd2915 portmap: Add systemd service
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-17 14:18:15 +01:00
Andrei Gherzan
4fe188b085 ofono: Package systemd service
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-17 14:18:15 +01:00
Andrei Gherzan
f9b8725a5c bluez4: Package systemd service
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Acked-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-17 14:18:15 +01:00
Khem Raj
3663fda08f dhclient.service: Rearrange the cmdline for dhclient
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2013-01-08 09:31:52 -08:00
Khem Raj
6f86cfec55 dhcp: Add systemd unit file for dhclient
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2013-01-08 09:31:52 -08:00
Martin Jansa
e36b5b36e4 libpam: update bbappend to match new oe-core version
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-26 11:51:44 +01:00
Martin Jansa
616c8ec151 meta-systemd: move libpam bbappend to oe-core prefix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-26 11:45:25 +01:00
Martin Jansa
31ff8c0cb7 wpa-supplicant, gcc-common-4.6, packagegroup-qte-toolchain-target: use correct PRINC form
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-16 21:11:44 +01:00
Andreas Müller
7a8e502971 lighttpd: follow oe-core to 1.4.32
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-14 09:31:32 +01:00
Martin Jansa
8b4f56eda8 util-linux: add meta-systemd bbappend for new version which installs uuidd.service and socket
* fixes:
util-linux-2.22.1: util-linux: Files/directories were installed but not shipped
  /lib/systemd
  /lib/systemd/system
  /lib/systemd/system/uuidd.socket
  /lib/systemd/system/uuidd.service

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-11 01:52:56 +01:00
Martin Jansa
0c398b0c79 dhcp: rename bbappend to match new version from oe-core and move to oe-core prefix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-11-29 11:03:34 +01:00
Andreas Müller
4a87464fa6 lighttpd: move systemd appends since recipe is in oe-core 2012-11-13 12:58:07 +01:00
Sander van Grieken
62884020d9 avahi: use systemd.bbclass for avahi-systemd
The original behaviour is to enable the service in the package postinst phase. This patch
will enable the service also when building the rootfs, so it fixes the case when no
package-management is enabled. It also now delegates systemd enablement to the systemd
bbclass, instead of using explicit code in the recipe itself.

Signed-off-by: Sander van Grieken <sander@outrightsolutions.nl>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-09-04 14:49:01 +02:00
Andreas Müller
d7553889e8 wpa-supplicant: add systemd support
* native systemd support came in with v1.0 [1]
* needs [2] to work properly
* mends my wlan under control of networkmanager

[1] http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-1.git;a=blob_plain;f=wpa_supplicant/ChangeLog
[2] http://patches.openembedded.org/patch/34335/

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-08-21 19:08:58 +02:00
Andreas Müller
f3e8eac6df pulseaudio: remove bbappend
oe-core has updated to 2.1 which includes the appended patch

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-08-20 22:51:54 +02:00
Martin Jansa
ab6cc21103 meta-systemd: pulseaudio: rename bbappend to match new oe-core version
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-07-19 19:54:30 +02:00
Martin Jansa
9e2751773c pulseaudio: add patch to fix build with new udev API provided by systemd recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-07-19 11:07:12 +02:00