mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-01 13:40:04 +00:00
Code Issues Projects Releases Wiki Activity

Quagga: clean up whitespaces/hardtabs in recipe

Browse Source 
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>
This commit is contained in:
Aws Ismail
2013-03-25 11:30:07 -04:00
committed by Joe MacDonald
parent f64db3011c
commit 525306f575
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-protocols/quagga/quagga.inc
+27 -27
View File
@@ -52,32 +52,32 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \
${SNMP_CONF}" ${SNMP_CONF}"
do_install () { do_install () {
# Install init script and default settings # Install init script and default settings
install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \
${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles ${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles
install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga
install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga
install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga
install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga
install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
# Install sample configurations for the daemons # Install sample configurations for the daemons
for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do
install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample
done done
# Install quagga # Install quagga
oe_runmake install DESTDIR=${D} prefix=${prefix} \ oe_runmake install DESTDIR=${D} prefix=${prefix} \
sbindir=${sbindir} \ sbindir=${sbindir} \
sysconfdir=${sysconfdir}/quagga \ sysconfdir=${sysconfdir}/quagga \
localstatedir=${localstatedir}/run/quagga localstatedir=${localstatedir}/run/quagga
# Fix hardcoded paths # Fix hardcoded paths
sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/*
sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga
sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga
sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
} }
# Split into a main package and separate per-protocol packages # Split into a main package and separate per-protocol packages
@@ -125,10 +125,10 @@ pkg_postinst_${PN} () {
exit 1 exit 1
fi fi
for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done for f in bgpd babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done
chown quagga:quaggavty ${sysconfdir}/quagga chown quagga:quaggavty ${sysconfdir}/quagga
chown quagga:quagga ${sysconfdir}/quagga/*.conf chown quagga:quagga ${sysconfdir}/quagga/*.conf
chmod 750 ${sysconfdir}/quagga chmod 750 ${sysconfdir}/quagga
chown 640 ${sysconfdir}/quagga/*.conf chown 640 ${sysconfdir}/quagga/*.conf
if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
${sysconfdir}/init.d/populate-volatile.sh update ${sysconfdir}/init.d/populate-volatile.sh update
fi fi