diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-10 12:42:14 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-10 12:42:14 +0100 |
commit | 0194f1b2896b487c723aa736be1f840d10feb0b5 (patch) | |
tree | 6a65dbded2fe8a958ae900f60034e5bdc757c5fc /recipes-ti | |
parent | 1c97b98f369c11043a484c1b1bb0626df2198fa9 (diff) | |
download | meta-ti-0194f1b2896b487c723aa736be1f840d10feb0b5.tar.gz |
gadget-init: minor logic cleanups
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-ti')
-rw-r--r-- | recipes-ti/beagleboard/gadget-init.bb | 6 | ||||
-rw-r--r-- | recipes-ti/beagleboard/gadget-init/network-gadget-init.service | 7 | ||||
-rw-r--r-- | recipes-ti/beagleboard/gadget-init/udhcpd.service | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/recipes-ti/beagleboard/gadget-init.bb b/recipes-ti/beagleboard/gadget-init.bb index 247d2e10..8ddefaa2 100644 --- a/recipes-ti/beagleboard/gadget-init.bb +++ b/recipes-ti/beagleboard/gadget-init.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | DESCRIPTION = "Units to initialize usb gadgets" | 1 | DESCRIPTION = "Units to initialize usb gadgets" |
2 | 2 | ||
3 | PR = "r9" | 3 | PR = "r10" |
4 | 4 | ||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
@@ -24,7 +24,7 @@ do_install() { | |||
24 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants | 24 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants |
25 | install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system | 25 | install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system |
26 | 26 | ||
27 | for i in ${WORKDIR}/*.service ; do | 27 | for i in ${WORKDIR}/storage-gadget-init.service ; do |
28 | install -m 0644 $i ${D}${base_libdir}/systemd/system | 28 | install -m 0644 $i ${D}${base_libdir}/systemd/system |
29 | ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/ | 29 | ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/ |
30 | done | 30 | done |
@@ -48,7 +48,7 @@ FILES_${PN}-storage = "${base_libdir}/systemd/system/storage-gadget-init.service | |||
48 | ${sysconfdir}/udev/rules.d/bone-gmass-eject.rules" | 48 | ${sysconfdir}/udev/rules.d/bone-gmass-eject.rules" |
49 | 49 | ||
50 | FILES_${PN}-network = "${base_libdir}/systemd/system/network-gadget-init.service \ | 50 | FILES_${PN}-network = "${base_libdir}/systemd/system/network-gadget-init.service \ |
51 | ${base_libdir}systemd/system/basic.target.wants/network-gadget-init.service \ | 51 | ${base_libdir}/systemd/system/basic.target.wants/network-gadget-init.service \ |
52 | ${bindir}/g-ether-load.sh \ | 52 | ${bindir}/g-ether-load.sh \ |
53 | ${bindir}/g-ether-start-service.sh" | 53 | ${bindir}/g-ether-start-service.sh" |
54 | 54 | ||
diff --git a/recipes-ti/beagleboard/gadget-init/network-gadget-init.service b/recipes-ti/beagleboard/gadget-init/network-gadget-init.service index 979d8aa4..1e226272 100644 --- a/recipes-ti/beagleboard/gadget-init/network-gadget-init.service +++ b/recipes-ti/beagleboard/gadget-init/network-gadget-init.service | |||
@@ -4,6 +4,9 @@ Conflicts=storage-gadget-init.service | |||
4 | 4 | ||
5 | [Service] | 5 | [Service] |
6 | RemainAfterExit=yes | 6 | RemainAfterExit=yes |
7 | ExecStart=/usr/bin/g-ether-load.sh | 7 | ExecStartPre=/usr/bin/g-ether-load.sh |
8 | ExecStartPost=/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252 | 8 | ExecStart=/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252 |
9 | ExecStop=/sbin/rmmod g_ether | 9 | ExecStop=/sbin/rmmod g_ether |
10 | |||
11 | [Install] | ||
12 | WantedBy=gether.target | ||
diff --git a/recipes-ti/beagleboard/gadget-init/udhcpd.service b/recipes-ti/beagleboard/gadget-init/udhcpd.service index f0766733..1f4ac688 100644 --- a/recipes-ti/beagleboard/gadget-init/udhcpd.service +++ b/recipes-ti/beagleboard/gadget-init/udhcpd.service | |||
@@ -1,6 +1,7 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=DHCP server for USB0 network gadget | 2 | Description=DHCP server for USB0 network gadget |
3 | After=sys-devices-platform-omap-ti81xx\x2dusbss-musb\x2dhdrc.0-gadget-net-usb0.device | 3 | After=dev-usb0.device |
4 | Conflicts=storage-gadget-init.service | ||
4 | 5 | ||
5 | [Service] | 6 | [Service] |
6 | ExecStart=/usr/sbin/udhcpd -f -S /etc/udhcpd.conf | 7 | ExecStart=/usr/sbin/udhcpd -f -S /etc/udhcpd.conf |
@@ -8,4 +9,4 @@ ExecStop=/bin/kill -TERM $MAINPID | |||
8 | KillSignal=SIGINT | 9 | KillSignal=SIGINT |
9 | 10 | ||
10 | [Install] | 11 | [Install] |
11 | WantedBy=basic.target | 12 | WantedBy=gether.target |