1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-07 11:59:49 +00:00

gadget-init: minor logic cleanups

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-11-10 12:42:14 +01:00
parent 1c97b98f36
commit 0194f1b289
3 changed files with 11 additions and 7 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
DESCRIPTION = "Units to initialize usb gadgets"
PR = "r9"
PR = "r10"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
@@ -24,7 +24,7 @@ do_install() {
install -d ${D}${base_libdir}/systemd/system/basic.target.wants
install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system
for i in ${WORKDIR}/*.service ; do
for i in ${WORKDIR}/storage-gadget-init.service ; do
install -m 0644 $i ${D}${base_libdir}/systemd/system
ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/
done
@@ -48,7 +48,7 @@ FILES_${PN}-storage = "${base_libdir}/systemd/system/storage-gadget-init.service
${sysconfdir}/udev/rules.d/bone-gmass-eject.rules"
FILES_${PN}-network = "${base_libdir}/systemd/system/network-gadget-init.service \
${base_libdir}systemd/system/basic.target.wants/network-gadget-init.service \
${base_libdir}/systemd/system/basic.target.wants/network-gadget-init.service \
${bindir}/g-ether-load.sh \
${bindir}/g-ether-start-service.sh"
@@ -4,6 +4,9 @@ Conflicts=storage-gadget-init.service
[Service]
RemainAfterExit=yes
ExecStart=/usr/bin/g-ether-load.sh
ExecStartPost=/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252
ExecStartPre=/usr/bin/g-ether-load.sh
ExecStart=/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252
ExecStop=/sbin/rmmod g_ether
[Install]
WantedBy=gether.target
@@ -1,6 +1,7 @@
[Unit]
Description=DHCP server for USB0 network gadget
After=sys-devices-platform-omap-ti81xx\x2dusbss-musb\x2dhdrc.0-gadget-net-usb0.device
After=dev-usb0.device
Conflicts=storage-gadget-init.service
[Service]
ExecStart=/usr/sbin/udhcpd -f -S /etc/udhcpd.conf
@@ -8,4 +9,4 @@ ExecStop=/bin/kill -TERM $MAINPID
KillSignal=SIGINT
[Install]
WantedBy=basic.target
WantedBy=gether.target