12 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 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 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 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
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
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