summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaciej Borzecki <maciej.borzecki@open-rnd.pl>2016-02-10 13:32:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:45 +0000
commit6be3031dd4c90c476f25e593a8f203c6258b17e9 (patch)
treec7c47435503480cc20a6ee55061cfea2aebd6045 /meta
parent85728ec99ca4da068763010308bf0eef1790a17a (diff)
downloadpoky-6be3031dd4c90c476f25e593a8f203c6258b17e9.tar.gz
systemd: extend PACKAGECONFIG flags
We currently ship a rather full-blown setup of system. Very few configuration knobs are actually exposed through PACKAGECONFIG flags. This patch adds new PACKAGECONFIG flags for some finer tuning of systemd's functionality. The default setting attempts to preserve all of the features that were previously auto-enabled. (From OE-Core rev: 724967819b8007fedcdad6afca4bc521392d7527) Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_228.bb64
1 files changed, 57 insertions, 7 deletions
diff --git a/meta/recipes-core/systemd/systemd_228.bb b/meta/recipes-core/systemd/systemd_228.bb
index 1c58c865dd..ab88c554db 100644
--- a/meta/recipes-core/systemd/systemd_228.bb
+++ b/meta/recipes-core/systemd/systemd_228.bb
@@ -64,6 +64,28 @@ PACKAGECONFIG ??= "compat xz ldconfig \
64 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 64 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
65 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 65 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
66 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ 66 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
67 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
68 ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'efi', '', d)} \
69 sysusers \
70 binfmt \
71 randomseed \
72 machined \
73 backlight \
74 quotacheck \
75 bootchart \
76 hostnamed \
77 myhostname \
78 hibernate \
79 timedated \
80 timesyncd \
81 localed \
82 kdbus \
83 ima \
84 smack \
85 logind \
86 firstboot \
87 utmp \
88 polkit \
67 " 89 "
68PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" 90PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
69# Sign the journal for anti-tampering 91# Sign the journal for anti-tampering
@@ -76,6 +98,30 @@ PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicroht
76PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" 98PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils"
77PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" 99PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved"
78PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" 100PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"
101PACKAGECONFIG[machined] = "--enable-machined,--disable-machined"
102PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight"
103PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck"
104PACKAGECONFIG[bootchart] = "--enable-bootchart,--disable-bootchart"
105PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed"
106PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname"
107PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill"
108PACKAGECONFIG[hibernate] = "--enable-hibernate,--disable-hibernate"
109PACKAGECONFIG[timedated] = "--enable-timedated,--disable-timedated"
110PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd"
111PACKAGECONFIG[localed] = "--enable-localed,--disable-localed"
112PACKAGECONFIG[efi] = "--enable-efi,--disable-efi"
113PACKAGECONFIG[kdbus] = "--enable-kdbus,--disable-kdbus"
114PACKAGECONFIG[ima] = "--enable-ima,--disable-ima"
115PACKAGECONFIG[smack] = "--enable-smack,--disable-smack"
116# libseccomp is found in meta-security
117PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp"
118PACKAGECONFIG[logind] = "--enable-logind,--disable-logind"
119PACKAGECONFIG[sysusers] = "--enable-sysusers,--disable-sysusers"
120PACKAGECONFIG[firstboot] = "--enable-firstboot,--disable-firstboot"
121PACKAGECONFIG[randomseed] = "--enable-randomseed,--disable-randomseed"
122PACKAGECONFIG[binfmt] = "--enable-binfmt,--disable-binfmt"
123PACKAGECONFIG[utmp] = "--enable-utmp,--disable-utmp"
124PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit"
79# importd requires curl/xz/zlib/bzip2/gcrypt 125# importd requires curl/xz/zlib/bzip2/gcrypt
80PACKAGECONFIG[importd] = "--enable-importd,--disable-importd" 126PACKAGECONFIG[importd] = "--enable-importd,--disable-importd"
81PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" 127PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
@@ -186,17 +232,20 @@ do_install() {
186 # Delete journal README, as log can be symlinked inside volatile. 232 # Delete journal README, as log can be symlinked inside volatile.
187 rm -f ${D}/${localstatedir}/log/README 233 rm -f ${D}/${localstatedir}/log/README
188 234
189 # Create symlinks for systemd-update-utmp-runlevel.service
190 install -d ${D}${systemd_unitdir}/system/graphical.target.wants 235 install -d ${D}${systemd_unitdir}/system/graphical.target.wants
191 install -d ${D}${systemd_unitdir}/system/multi-user.target.wants 236 install -d ${D}${systemd_unitdir}/system/multi-user.target.wants
192 install -d ${D}${systemd_unitdir}/system/poweroff.target.wants 237 install -d ${D}${systemd_unitdir}/system/poweroff.target.wants
193 install -d ${D}${systemd_unitdir}/system/reboot.target.wants 238 install -d ${D}${systemd_unitdir}/system/reboot.target.wants
194 install -d ${D}${systemd_unitdir}/system/rescue.target.wants 239 install -d ${D}${systemd_unitdir}/system/rescue.target.wants
195 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service 240
196 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service 241 # Create symlinks for systemd-update-utmp-runlevel.service
197 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/poweroff.target.wants/systemd-update-utmp-runlevel.service 242 if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then
198 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/reboot.target.wants/systemd-update-utmp-runlevel.service 243 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service
199 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service 244 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service
245 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/poweroff.target.wants/systemd-update-utmp-runlevel.service
246 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/reboot.target.wants/systemd-update-utmp-runlevel.service
247 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service
248 fi
200 249
201 # Enable journal to forward message to syslog daemon 250 # Enable journal to forward message to syslog daemon
202 sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf 251 sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf
@@ -255,7 +304,8 @@ SYSTEMD_PACKAGES = "${PN}-binfmt"
255SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" 304SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
256 305
257USERADD_PACKAGES = "${PN}" 306USERADD_PACKAGES = "${PN}"
258USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" 307USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system systemd-journal-gateway;', '', d)}"
308USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system systemd-timesync;', '', d)}"
259GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" 309GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"
260 310
261FILES_${PN}-analyze = "${bindir}/systemd-analyze" 311FILES_${PN}-analyze = "${bindir}/systemd-analyze"