diff options
Diffstat (limited to 'meta-systemd/recipes-core/systemd/systemd_git.bb')
-rw-r--r-- | meta-systemd/recipes-core/systemd/systemd_git.bb | 93 |
1 files changed, 79 insertions, 14 deletions
diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb index f4ca72a12..8af1aa571 100644 --- a/meta-systemd/recipes-core/systemd/systemd_git.bb +++ b/meta-systemd/recipes-core/systemd/systemd_git.bb | |||
@@ -1,9 +1,14 @@ | |||
1 | DESCRIPTION = "Systemd a init replacement" | 1 | DESCRIPTION = "Systemd a init replacement" |
2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" | 2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" |
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" | ||
5 | 3 | ||
6 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers" | 4 | LICENSE = "GPLv2 & LGPLv2.1 & MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ | ||
6 | file://LICENSE.LGPL2.1;md5=fb919cc88dbe06ec0b0bd50e001ccf1f \ | ||
7 | file://LICENSE.MIT;md5=544799d0b492f119fa04641d1b8868ed" | ||
8 | |||
9 | PROVIDES = "udev" | ||
10 | |||
11 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers" | ||
7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
8 | 13 | ||
9 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" | 14 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" |
@@ -14,20 +19,17 @@ inherit gitpkgv | |||
14 | PKGV = "v${GITPKGVTAG}" | 19 | PKGV = "v${GITPKGVTAG}" |
15 | 20 | ||
16 | PV = "git" | 21 | PV = "git" |
17 | PR = "r27" | 22 | PR = "r0" |
18 | 23 | ||
19 | inherit useradd pkgconfig autotools vala perlnative | 24 | inherit useradd pkgconfig autotools vala perlnative |
20 | 25 | ||
21 | SRCREV = "3eff4208ffecedd778fec260f0d4b18e94dab443" | 26 | SRCREV = "cd96b3b86abb4a88cac2722bdfb6e5d4413f6831" |
22 | 27 | ||
23 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ | 28 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ |
24 | ${UCLIBCPATCHES} \ | 29 | file://gtk-doc.make \ |
30 | file://touchscreen.rules \ | ||
31 | file://modprobe.rules \ | ||
25 | " | 32 | " |
26 | UCLIBCPATCHES = "" | ||
27 | UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \ | ||
28 | file://format-replace-m-uclibc.patch \ | ||
29 | " | ||
30 | |||
31 | LDFLAGS_libc-uclibc_append = " -lrt" | 33 | LDFLAGS_libc-uclibc_append = " -lrt" |
32 | 34 | ||
33 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |
@@ -39,17 +41,27 @@ SYSTEMDDISTRO_angstrom = "angstrom" | |||
39 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ | 41 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ |
40 | --with-rootprefix=${base_prefix} \ | 42 | --with-rootprefix=${base_prefix} \ |
41 | --with-rootlibdir=${base_libdir} \ | 43 | --with-rootlibdir=${base_libdir} \ |
44 | --sbindir=${base_sbindir} \ | ||
45 | --libexecdir=${base_libdir} \ | ||
42 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ | 46 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ |
43 | --disable-gtk \ | ||
44 | --enable-xz \ | 47 | --enable-xz \ |
45 | --disable-manpages \ | 48 | --disable-manpages \ |
46 | --disable-coredump \ | 49 | --disable-coredump \ |
50 | --disable-introspection \ | ||
51 | --with-pci-ids-path=/usr/share/misc \ | ||
52 | ac_cv_file__usr_share_pci_ids=no \ | ||
53 | ac_cv_file__usr_share_hwdata_pci_ids=no \ | ||
54 | ac_cv_file__usr_share_misc_pci_ids=yes \ | ||
55 | --disable-gtk-doc-html \ | ||
56 | --disable-tcpwrap \ | ||
47 | " | 57 | " |
48 | 58 | ||
49 | # There's no docbook-xsl-native, so for the xsltproc check to false | 59 | # There's no docbook-xsl-native, so for the xsltproc check to false |
50 | do_configure_prepend() { | 60 | do_configure_prepend() { |
51 | sed -i /xsltproc/d configure.ac | 61 | sed -i /xsltproc/d configure.ac |
52 | 62 | ||
63 | cp ${WORKDIR}/gtk-doc.make ${S}/docs/ | ||
64 | |||
53 | # we only have /home/root, not /root | 65 | # we only have /home/root, not /root |
54 | sed -i -e 's:=/root:=/home/root:g' units/*.service* | 66 | sed -i -e 's:=/root:=/home/root:g' units/*.service* |
55 | } | 67 | } |
@@ -68,6 +80,8 @@ do_install() { | |||
68 | # create machine-id | 80 | # create machine-id |
69 | # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable | 81 | # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable |
70 | touch ${D}${sysconfdir}/machine-id | 82 | touch ${D}${sysconfdir}/machine-id |
83 | |||
84 | install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ | ||
71 | } | 85 | } |
72 | 86 | ||
73 | python populate_packages_prepend (){ | 87 | python populate_packages_prepend (){ |
@@ -100,10 +114,18 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
100 | ${datadir}/dbus-1/system-services \ | 114 | ${datadir}/dbus-1/system-services \ |
101 | ${datadir}/polkit-1 \ | 115 | ${datadir}/polkit-1 \ |
102 | ${datadir}/${PN} \ | 116 | ${datadir}/${PN} \ |
103 | ${sysconfdir} \ | 117 | ${sysconfdir}/bash_completion.d/ \ |
118 | ${sysconfdir}/binfmt.d/ \ | ||
119 | ${sysconfdir}/dbus-1/ \ | ||
120 | ${sysconfdir}/machine-id \ | ||
121 | ${sysconfdir}/modules-load.d/ \ | ||
122 | ${sysconfdir}/sysctl.d/ \ | ||
123 | ${sysconfdir}/systemd/ \ | ||
124 | ${sysconfdir}/tmpfiles.d/ \ | ||
125 | ${sysconfdir}/xdg/ \ | ||
104 | ${systemd_unitdir}/* \ | 126 | ${systemd_unitdir}/* \ |
105 | ${systemd_unitdir}/system/* \ | 127 | ${systemd_unitdir}/system/* \ |
106 | ${base_libdir}/udev/rules.d \ | 128 | ${base_libdir}/udev/rules.d/99-systemd.rules \ |
107 | ${base_libdir}/security/*.so \ | 129 | ${base_libdir}/security/*.so \ |
108 | /cgroup \ | 130 | /cgroup \ |
109 | ${bindir}/systemd* \ | 131 | ${bindir}/systemd* \ |
@@ -114,6 +136,10 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
114 | ${libdir}/sysctl.d \ | 136 | ${libdir}/sysctl.d \ |
115 | ${localstatedir} \ | 137 | ${localstatedir} \ |
116 | ${libexecdir} \ | 138 | ${libexecdir} \ |
139 | ${base_libdir}/udev/rules.d/70-uaccess.rules \ | ||
140 | ${base_libdir}/udev/rules.d/71-seat.rules \ | ||
141 | ${base_libdir}/udev/rules.d/73-seat-late.rules \ | ||
142 | ${base_libdir}/udev/rules.d/99-systemd.rules \ | ||
117 | " | 143 | " |
118 | 144 | ||
119 | FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" | 145 | FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" |
@@ -136,6 +162,45 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \ | |||
136 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ | 162 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ |
137 | " | 163 | " |
138 | 164 | ||
165 | PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd" | ||
166 | |||
167 | FILES_udev-dbg += "${base_libdir}/udev/.debug" | ||
168 | |||
169 | RDEPENDS_udev += "udev-utils" | ||
170 | RPROVIDES_udev = "hotplug" | ||
171 | |||
172 | FILES_udev += "${base_libdir}/udev/udevd \ | ||
173 | ${base_libdir}/systemd/systemd-udevd \ | ||
174 | ${base_libdir}/udev/accelerometer \ | ||
175 | ${base_libdir}/udev/ata_id \ | ||
176 | ${base_libdir}/udev/cdrom_id \ | ||
177 | ${base_libdir}/udev/collect \ | ||
178 | ${base_libdir}/udev/findkeyboards \ | ||
179 | ${base_libdir}/udev/keyboard-force-release.sh \ | ||
180 | ${base_libdir}/udev/keymap \ | ||
181 | ${base_libdir}/udev/mtd_probe \ | ||
182 | ${base_libdir}/udev/scsi_id \ | ||
183 | ${base_libdir}/udev/v4l_id \ | ||
184 | ${base_libdir}/udev/keymaps \ | ||
185 | ${base_libdir}/udev/rules.d/4*.rules \ | ||
186 | ${base_libdir}/udev/rules.d/5*.rules \ | ||
187 | ${base_libdir}/udev/rules.d/6*.rules \ | ||
188 | ${base_libdir}/udev/rules.d/70-power-switch.rules \ | ||
189 | ${base_libdir}/udev/rules.d/75*.rules \ | ||
190 | ${base_libdir}/udev/rules.d/78*.rules \ | ||
191 | ${base_libdir}/udev/rules.d/8*.rules \ | ||
192 | ${base_libdir}/udev/rules.d/95*.rules \ | ||
193 | ${sysconfdir}/udev \ | ||
194 | " | ||
195 | |||
196 | FILES_udev-consolekit += "${libdir}/ConsoleKit" | ||
197 | RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" | ||
198 | |||
199 | FILES_udev-utils = "${bindir}/udevadm" | ||
200 | |||
201 | FILES_udev-systemd = "${base_libdir}/systemd/system/*udev* ${base_libdir}/systemd/system/*.wants/*udev*" | ||
202 | RDEPENDS_udev-systemd = "udev" | ||
203 | |||
139 | # TODO: | 204 | # TODO: |
140 | # u-a for runlevel and telinit | 205 | # u-a for runlevel and telinit |
141 | 206 | ||