diff options
author | Aws Ismail <aws.ismail@windriver.com> | 2013-03-25 11:30:07 -0400 |
---|---|---|
committer | Joe MacDonald <joe.macdonald@windriver.com> | 2013-03-25 13:09:38 -0400 |
commit | 525306f575eaa9c85309efade27450214359a780 (patch) | |
tree | 75dc317a15619507b93512a778608cb7dd466253 /meta-networking/recipes-protocols | |
parent | f64db3011c04ada0a8ac04b9eddde05b67d21eec (diff) | |
download | meta-openembedded-525306f575eaa9c85309efade27450214359a780.tar.gz |
Quagga: clean up whitespaces/hardtabs in recipe
Minor clean-up for some places where whitespaces
and hardtabs stil existed.
Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Diffstat (limited to 'meta-networking/recipes-protocols')
-rw-r--r-- | meta-networking/recipes-protocols/quagga/quagga.inc | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 9a70d183f..b40c85803 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc | |||
@@ -52,32 +52,32 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ | |||
52 | ${SNMP_CONF}" | 52 | ${SNMP_CONF}" |
53 | 53 | ||
54 | do_install () { | 54 | do_install () { |
55 | # Install init script and default settings | 55 | # Install init script and default settings |
56 | install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ | 56 | install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ |
57 | ${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles | 57 | ${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles |
58 | install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga | 58 | install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga |
59 | install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga | 59 | install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga |
60 | install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga | 60 | install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga |
61 | install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga | 61 | install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga |
62 | install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga | 62 | install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga |
63 | 63 | ||
64 | # Install sample configurations for the daemons | 64 | # Install sample configurations for the daemons |
65 | for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do | 65 | for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do |
66 | install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample | 66 | install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample |
67 | done | 67 | done |
68 | 68 | ||
69 | # Install quagga | 69 | # Install quagga |
70 | oe_runmake install DESTDIR=${D} prefix=${prefix} \ | 70 | oe_runmake install DESTDIR=${D} prefix=${prefix} \ |
71 | sbindir=${sbindir} \ | 71 | sbindir=${sbindir} \ |
72 | sysconfdir=${sysconfdir}/quagga \ | 72 | sysconfdir=${sysconfdir}/quagga \ |
73 | localstatedir=${localstatedir}/run/quagga | 73 | localstatedir=${localstatedir}/run/quagga |
74 | 74 | ||
75 | # Fix hardcoded paths | 75 | # Fix hardcoded paths |
76 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* | 76 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* |
77 | sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga | 77 | sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga |
78 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga | 78 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga |
79 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga | 79 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga |
80 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* | 80 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* |
81 | } | 81 | } |
82 | 82 | ||
83 | # Split into a main package and separate per-protocol packages | 83 | # Split into a main package and separate per-protocol packages |
@@ -125,10 +125,10 @@ pkg_postinst_${PN} () { | |||
125 | exit 1 | 125 | exit 1 |
126 | fi | 126 | fi |
127 | for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done | 127 | for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done |
128 | chown quagga:quaggavty ${sysconfdir}/quagga | 128 | chown quagga:quaggavty ${sysconfdir}/quagga |
129 | chown quagga:quagga ${sysconfdir}/quagga/*.conf | 129 | chown quagga:quagga ${sysconfdir}/quagga/*.conf |
130 | chmod 750 ${sysconfdir}/quagga | 130 | chmod 750 ${sysconfdir}/quagga |
131 | chown 640 ${sysconfdir}/quagga/*.conf | 131 | chown 640 ${sysconfdir}/quagga/*.conf |
132 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then | 132 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then |
133 | ${sysconfdir}/init.d/populate-volatile.sh update | 133 | ${sysconfdir}/init.d/populate-volatile.sh update |
134 | fi | 134 | fi |