mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

systemd: move machine specific package out to a new recipe

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-06-28 16:21:44 +02:00
parent 15a5642b2a
commit 8a12ecca32
3 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/systemd/systemd-serialgetty.bb
+43
View File
@@ -0,0 +1,43 @@
require systemd_git.bb
SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
file://serial-getty@.service \
"
DESCRIPTION = "Systemd serial config"
SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
do_configure() {
:
}
do_compile() {
:
}
def get_baudrate(bb, d):
return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]
def get_console(bb, d):
return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1]
do_install() {
if [ ! ${@get_baudrate(bb, d)} = "" ]; then
sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/serial-getty@.service
install -d ${D}${base_libdir}/systemd/system/
install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/
ln -sf ${base_libdir}/systemd/system/serial-getty@.service \
${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(bb, d)}.service
fi
}
PACKAGES = "{$PN} ${PN}-dbg ${PN}-dev ${PN}-doc"
RRECOMMENDS_${PN} = ""
RDEPENDS_${PN} = "systemd"
# This is a machine specific file
FILES_${PN} = "${base_libdir}/systemd/system/serial-getty@.service ${sysconfdir}/systemd/system/getty.target.wants/getty@${@get_console(bb, d)}.service"
PACKAGE_ARCH = "${MACHINE_ARCH}"
meta-oe/recipes-core/systemd/systemd/serial-getty@.service → meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
View File
meta-oe/recipes-core/systemd/systemd_git.bb
+2 -24
View File
@@ -23,7 +23,6 @@ SRCREV = "ae556c210942cb6986c6d77b58505b5daa66bbe2"
SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
file://0001-systemd-disable-xml-file-stuff-and-introspection.patch \
file://serial-getty@.service \
"
S = "${WORKDIR}/git"
@@ -38,37 +37,16 @@ EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
--disable-gtk \
"
def get_baudrate(bb, d):
return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[0]
def get_console(bb, d):
return bb.data.getVar('SERIAL_CONSOLE', d, 1).split()[1]
do_install() {
autotools_do_install
if [ ! ${@get_baudrate(bb, d)} = "" ]; then
sed -i -e s/\@BAUDRATE\@/${@get_baudrate(bb, d)}/g ${WORKDIR}/serial-getty@.service
install ${WORKDIR}/serial-getty@.service ${D}${base_libdir}/systemd/system/
ln -sf ${base_libdir}/systemd/system/serial-getty@.service \
${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@${@get_console(bb, d)}.service
fi
}
# ARM doesn't support hugepages, so don't try to mount them
do_install_append_arm() {
rm -f ${D}${base_libdir}/systemd/system/*hugepages.mount
rm -f ${D}${base_libdir}/systemd/system/*/*hugepages.mount
}
PACKAGES =+ "${PN}-gui ${PN}-serialgetty"
PACKAGES =+ "${PN}-gui"
FILES_${PN}-gui = "${bindir}/systemadm"
# This is a machine specific file
FILES_${PN}-serialgetty = "${base_libdir}/systemd/system/serial-getty@.service ${sysconfdir}/systemd/system/getty.target.wants/getty@${@get_console(bb, d)}.service"
PACKAGE_ARCH_${PN}-serialgetty = "${MACHINE_ARCH}"
FILES_${PN} = " ${base_bindir}/* \
${datadir}/dbus-1/services \
${datadir}/dbus-1/system-services \
@@ -94,7 +72,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
# of blacklist support, so use proper modprobe from module-init-tools
# And pull in the kernel modules mentioned in INSTALL
RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
${PN}-serialgetty \
systemd-serialgetty \
util-linux-agetty \
module-init-tools \
kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \