diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd_228.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd_228.bb | 64 |
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 | " |
68 | PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" | 90 | PACKAGECONFIG[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 | |||
76 | PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" | 98 | PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" |
77 | PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" | 99 | PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" |
78 | PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" | 100 | PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" |
101 | PACKAGECONFIG[machined] = "--enable-machined,--disable-machined" | ||
102 | PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight" | ||
103 | PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck" | ||
104 | PACKAGECONFIG[bootchart] = "--enable-bootchart,--disable-bootchart" | ||
105 | PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed" | ||
106 | PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname" | ||
107 | PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill" | ||
108 | PACKAGECONFIG[hibernate] = "--enable-hibernate,--disable-hibernate" | ||
109 | PACKAGECONFIG[timedated] = "--enable-timedated,--disable-timedated" | ||
110 | PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd" | ||
111 | PACKAGECONFIG[localed] = "--enable-localed,--disable-localed" | ||
112 | PACKAGECONFIG[efi] = "--enable-efi,--disable-efi" | ||
113 | PACKAGECONFIG[kdbus] = "--enable-kdbus,--disable-kdbus" | ||
114 | PACKAGECONFIG[ima] = "--enable-ima,--disable-ima" | ||
115 | PACKAGECONFIG[smack] = "--enable-smack,--disable-smack" | ||
116 | # libseccomp is found in meta-security | ||
117 | PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" | ||
118 | PACKAGECONFIG[logind] = "--enable-logind,--disable-logind" | ||
119 | PACKAGECONFIG[sysusers] = "--enable-sysusers,--disable-sysusers" | ||
120 | PACKAGECONFIG[firstboot] = "--enable-firstboot,--disable-firstboot" | ||
121 | PACKAGECONFIG[randomseed] = "--enable-randomseed,--disable-randomseed" | ||
122 | PACKAGECONFIG[binfmt] = "--enable-binfmt,--disable-binfmt" | ||
123 | PACKAGECONFIG[utmp] = "--enable-utmp,--disable-utmp" | ||
124 | PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit" | ||
79 | # importd requires curl/xz/zlib/bzip2/gcrypt | 125 | # importd requires curl/xz/zlib/bzip2/gcrypt |
80 | PACKAGECONFIG[importd] = "--enable-importd,--disable-importd" | 126 | PACKAGECONFIG[importd] = "--enable-importd,--disable-importd" |
81 | PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" | 127 | PACKAGECONFIG[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" | |||
255 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" | 304 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" |
256 | 305 | ||
257 | USERADD_PACKAGES = "${PN}" | 306 | USERADD_PACKAGES = "${PN}" |
258 | USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" | 307 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system systemd-journal-gateway;', '', d)}" |
308 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system systemd-timesync;', '', d)}" | ||
259 | GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" | 309 | GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" |
260 | 310 | ||
261 | FILES_${PN}-analyze = "${bindir}/systemd-analyze" | 311 | FILES_${PN}-analyze = "${bindir}/systemd-analyze" |