Replace systemd_unitdir/system with systemd_system_unitdir

for/laforge/nightly
Pau Espin 6 years ago
parent c8c2531e08
commit 7990e01fcd
  1. 2
      recipes-apps/images/sysmocom-bsc-image.bb
  2. 2
      recipes-apps/images/sysmocom-nitb-image.bb
  3. 6
      recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
  4. 6
      recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_2.bb
  5. 8
      recipes-bsp/early-date/early-date_1.bb
  6. 12
      recipes-bsp/ntp/ntp_4.2.8p6.bb
  7. 6
      recipes-bsp/sob-odu/usb2514_1.bb
  8. 4
      recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb
  9. 6
      recipes-extra/atftp/atftp_git.bb
  10. 4
      recipes-extra/dnsmasq/dnsmasq.inc
  11. 8
      recipes-extra/gpsd/gpsd_3.10.bb
  12. 8
      recipes-extra/gpsdate/gpsdate_git.bb
  13. 4
      recipes-extra/n2n/n2n_git.bb
  14. 6
      recipes-extra/openvpn/openvpn_2.3.6.bb
  15. 6
      recipes-extra/rauc/rauc.bb
  16. 12
      recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
  17. 16
      recipes-support/lc15-sysdev-remap/lc15-sysdev-remap_1.0.bb
  18. 10
      recipes-sysmobts/osmo-bts/osmo-bts_git.bb
  19. 4
      recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb

@ -9,7 +9,7 @@ activate_bsc() {
}
activate_systemd_bsc() {
ln -sf ${systemd_unitdir}/system/osmo-bsc.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
ln -sf ${systemd_system_unitdir}/osmo-bsc.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
}
IMAGE_PREPROCESS_COMMAND += "${@base_contains('DISTRO_FEATURES','systemd','activate_systemd_bsc','activate_bsc',d)}; "

@ -6,7 +6,7 @@ activate_nitb() {
}
activate_systemd_nitb() {
ln -sf ${systemd_unitdir}/system/osmo-nitb.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
ln -sf ${systemd_system_unitdir}/osmo-nitb.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
}
IMAGE_PREPROCESS_COMMAND += "${@base_contains('DISTRO_FEATURES','systemd','activate_systemd_nitb','activate_nitb',d)}; "

@ -19,9 +19,9 @@ do_install() {
install -m 0755 ${WORKDIR}/sysmocom-backup-data ${D}${sbindir}/
install -m 0755 ${WORKDIR}/sysmocom-restore-data ${D}${sbindir}/
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/data.mount ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/sysmocom-restore.service ${D}${systemd_unitdir}/system/
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/data.mount ${D}${systemd_system_unitdir}/
install -m 0644 ${WORKDIR}/sysmocom-restore.service ${D}${systemd_system_unitdir}/
}
SYSTEMD_PACKAGES = "${PN}"

@ -14,7 +14,7 @@ FILES_${PN} += "${systemd_unitdir}"
do_install() {
install -d ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/udhcpd.conf ${D}${sysconfdir}/
install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -m 0644 /${WORKDIR}/udhcpd.service ${D}${systemd_unitdir}/system/
ln -sf ../udhcpd.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
install -m 0644 /${WORKDIR}/udhcpd.service ${D}${systemd_system_unitdir}/
ln -sf ../udhcpd.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
}

@ -6,16 +6,16 @@ SRC_URI = "\
file://early-date \
file://early-date.service"
FILES_${PN} = "${systemd_unitdir}/system /sbin"
FILES_${PN} = "${systemd_system_unitdir} /sbin"
RDPEPENDS_${PN} = "systemd"
do_install() {
install -d ${D}/sbin
install -d ${D}${systemd_unitdir}/system/basic.target.wants
install -d ${D}${systemd_system_unitdir}/basic.target.wants
# Copy the service file and link it
install -m 0644 ${WORKDIR}/early-date.service ${D}${systemd_unitdir}/system
ln -sf ../early-date.service ${D}${systemd_unitdir}/system/basic.target.wants/
install -m 0644 ${WORKDIR}/early-date.service ${D}${systemd_system_unitdir}
ln -sf ../early-date.service ${D}${systemd_system_unitdir}/basic.target.wants/
# Hardcode to /sbin
# TODO: Set the date as of the build time..

@ -94,10 +94,10 @@ do_install_append() {
install -d ${D}/${sysconfdir}/network/if-up.d
ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_system_unitdir}/
install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_system_unitdir}/
install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_system_unitdir}/
install -d ${D}${systemd_unitdir}/ntp-units.d
install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
@ -145,13 +145,13 @@ FILES_ntpdate = "${sbindir}/ntpdate \
${sysconfdir}/network/if-up.d/ntpdate-sync \
${bindir}/ntpdate-sync \
${sysconfdir}/default/ntpdate \
${systemd_unitdir}/system/ntpdate.service \
${systemd_system_unitdir}/ntpdate.service \
${bindir}/ntpdate-cron \
${sysconfdir}/cron.d/ntpdate \
"
FILES_sntp = "${sbindir}/sntp \
${sysconfdir}/default/sntp \
${systemd_unitdir}/system/sntp.service \
${systemd_system_unitdir}/sntp.service \
"
CONFFILES_${PN} = "${sysconfdir}/ntp.conf"

@ -25,9 +25,9 @@ do_install() {
install -m 0755 ${WORKDIR}/usb2514 ${D}${bindir}/
install -m 0755 ${WORKDIR}/gpio_usb2514 ${D}${bindir}/
install -m 0755 ${WORKDIR}/odu-gpiotool ${D}${bindir}/
install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -m 0644 /${WORKDIR}/usb2514.service ${D}${systemd_unitdir}/system/
ln -sf ../usb2514.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
install -m 0644 /${WORKDIR}/usb2514.service ${D}${systemd_system_unitdir}/
ln -sf ../usb2514.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
}
FILES_${PN} += "${systemd_unitdir}"

@ -20,6 +20,6 @@ do_install() {
# feed.
FILES_${PN} += "${systemd_unitdir}"
do_install_append() {
install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
ln -sf ../openvpn.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
ln -sf ../openvpn.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
}

@ -40,8 +40,8 @@ do_install_append() {
rm ${D}${sbindir}/in.tftpd
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_system_unitdir}
}
PACKAGES =+ "${PN}d"
@ -51,7 +51,7 @@ FILES_${PN} = "${bindir}/*"
FILES_${PN}d = "${sbindir}/* \
${sysconfdir} \
/srv/tftp \
${systemd_unitdir}/system/atftpd.service \
${systemd_system_unitdir}/atftpd.service \
"
SYSTEMD_PACKAGES = "${PN}d"

@ -49,8 +49,8 @@ do_install () {
install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_system_unitdir}
install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir}

@ -107,9 +107,9 @@ do_install_append() {
install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
#support for systemd
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service
install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket
install -d ${D}${systemd_system_unitdir}/
install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service
install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_system_unitdir}/${BPN}.socket
}
pkg_postinst_${PN}-conf() {
@ -137,7 +137,7 @@ FILES_libgps = "${libdir}/libgps.so.*"
SUMMARY_gpsd-conf = "gpsd configuration files and init scripts"
FILES_gpsd-conf = "${sysconfdir}"
FILES_gpsd-conf_append_sysmocom-idu = " ${systemd_unitdir}/system/ "
FILES_gpsd-conf_append_sysmocom-idu = " ${systemd_system_unitdir}/ "
CONFFILES_gpsd-conf = "${sysconfdir}/default/gpsd.default"
SUMMARY_gpsd-gpsctl = "Tool for tweaking GPS modes"

@ -27,11 +27,11 @@ do_install() {
install -d ${D}/${sysconfdir}/init.d
install -m 0755 ${S}/gpsdate.init ${D}/${sysconfdir}/init.d/gpsdate
install -d ${D}${systemd_unitdir}/system
install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -d ${D}${systemd_system_unitdir}
install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
install -m 0644 ${S}/gpsdate.service ${D}${systemd_unitdir}/system
ln -sf ../gpsdate.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -m 0644 ${S}/gpsdate.service ${D}${systemd_system_unitdir}
ln -sf ../gpsdate.service ${D}${systemd_system_unitdir}/multi-user.target.wants/
install -d ${D}/${sysconfdir}/default
install -m 0644 ${WORKDIR}/gpsdate.default ${D}/${sysconfdir}/default/gpsdate

@ -26,8 +26,8 @@ do_install() {
oe_runmake install DESTDIR=${D}
install -d ${D}/usr/share/n2n
install -m 0755 ${WORKDIR}/edge.sh ${D}/usr/share/n2n
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/n2n-edge@.service ${D}${systemd_unitdir}/system
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/n2n-edge@.service ${D}${systemd_system_unitdir}
}
FILES_${PN} += "${systemd_unitdir}"

@ -33,10 +33,10 @@ do_install_append() {
install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
# systemd files
install -d ${D}${systemd_unitdir}/system
install -d ${D}${systemd_system_unitdir}
install -d ${D}${systemd_unitdir}/system-generators
install -m 0644 ${WORKDIR}/openvpn.service ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/openvpn@.service ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/openvpn.service ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/openvpn@.service ${D}${systemd_system_unitdir}
install -m 0755 ${WORKDIR}/openvpn-generator ${D}${systemd_unitdir}/system-generators
}

@ -52,9 +52,9 @@ do_install_append () {
install -m 0644 ${S}/data/de.pengutronix.rauc.conf ${D}${sysconfdir}/dbus-1/system.d/
# Systemd service
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/rauc-done.service ${D}${systemd_unitdir}/system/
sed -i -e 's!@BINDIR@!${bindir}!g' ${D}${systemd_unitdir}/system/*.service
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/rauc-done.service ${D}${systemd_system_unitdir}/
sed -i -e 's!@BINDIR@!${bindir}!g' ${D}${systemd_system_unitdir}/*.service
# udev rules
install -d ${D}${base_libdir}/udev/rules.d

@ -10,12 +10,12 @@ SRC_URI += "file://alignment.service"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
do_install_append() {
install -d ${D}${systemd_unitdir}/system/basic.target.wants
install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
install -d ${D}${systemd_system_unitdir}/basic.target.wants
install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/
install -m 0644 ${WORKDIR}/alignment.service ${D}${systemd_unitdir}/system
ln -sf ../alignment.service ${D}${systemd_unitdir}/system/basic.target.wants/
ln -sf ../alignment.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
install -m 0644 ${WORKDIR}/alignment.service ${D}${systemd_system_unitdir}
ln -sf ../alignment.service ${D}${systemd_system_unitdir}/basic.target.wants/
ln -sf ../alignment.service ${D}${systemd_system_unitdir}/sysinit.target.wants/
}
FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
FILES_${PN} = "${systemd_system_unitdir} ${bindir}"

@ -29,15 +29,15 @@ SYSTEMD_SERVICE_${PN} = "lc15-sysdev-remap.service mnt-rom-factory.automount mnt
do_install() {
install -d ${D}${bindir}
install -d ${D}/${systemd_unitdir}/system
install -d ${D}/${systemd_system_unitdir}
install -m 0755 ${S}/lc15-sysdev-remap ${D}${bindir}/lc15-sysdev-remap
install -m 0644 ${S}/lc15-sysdev-remap.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/mnt-rom-factory.automount ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/mnt-rom-factory.mount ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/mnt-rom-user.automount ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/mnt-rom-user.mount ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/mnt-storage.automount ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/mnt-storage.mount ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/lc15-sysdev-remap.service ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/mnt-rom-factory.automount ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/mnt-rom-factory.mount ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/mnt-rom-user.automount ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/mnt-rom-user.mount ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/mnt-storage.automount ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/mnt-storage.mount ${D}${systemd_system_unitdir}/
}
FILES_${PN} += "${bindir} \

@ -46,7 +46,7 @@ do_compile_append_sysmobts-v2() {
do_install_append() {
install -d ${D}${sysconfdir}/osmocom
install -d ${D}/${systemd_unitdir}/system
install -d ${D}/${systemd_system_unitdir}
}
do_install_append_sysmobts-v2() {
@ -57,8 +57,8 @@ do_install_append_sysmobts-v2() {
# Install systemd and enable on sysinit
install -m 0660 ${S}/doc/examples/sysmo/sysmobts-mgr.cfg ${D}${sysconfdir}/osmocom
install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/contrib/osmo-bts-sysmo.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_system_unitdir}/
install -m 0644 ${S}/contrib/osmo-bts-sysmo.service ${D}${systemd_system_unitdir}/
}
do_install_append_sysmobts2100() {
@ -69,9 +69,9 @@ do_install_append_sysmobts2100() {
cp ${D}/${bindir}/lc15bts-mgr ${D}/${bindir}/sysmobts-mgr
# Install systemd and enable on sysinit
install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_unitdir}/system/lc15bts-mgr.service
install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_system_unitdir}/lc15bts-mgr.service
install -m 0660 ${S}/doc/examples/litecell15/lc15bts-mgr.cfg ${D}${sysconfdir}/osmocom/
install -m 0644 ${S}/contrib/osmo-bts-lc15.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/contrib/osmo-bts-lc15.service ${D}${systemd_system_unitdir}/
}
SYSTEMD_SERVICE_${PN}_append_sysmobts-v2 = "sysmobts-mgr.service osmo-bts-sysmo.service"

@ -32,6 +32,6 @@ CPPFLAGS_append_sysmobts-v2 = " ${BTS_HW_VERSION} "
do_install_append() {
# Install systemd and enable on sysinit
install -d ${D}/${systemd_unitdir}/system
install -m 0644 ${S}/contrib/osmo-pcu.service ${D}${systemd_unitdir}/system/
install -d ${D}/${systemd_system_unitdir}
install -m 0644 ${S}/contrib/osmo-pcu.service ${D}${systemd_system_unitdir}/
}

Loading…
Cancel
Save