summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 22:49:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:23:17 +0200
commita45830a39bb47a9eab27980d52966226c9504ea4 (patch)
tree001209d9740e8668b2eeeac4212b3561aecebf29 /meta-oe/recipes-extended
parent6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff)
downloadmeta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python tasks). * Some recipes were using tabs. * Some were using 8 spaces. * Some were using mix or different number of spaces. * Make them consistently use 4 spaces everywhere. * Yocto styleguide advises to use tabs (but the only reason to keep tabs is the need to update a lot of recipes). Lately this advice was also merged into the styleguide on the OE wiki. * Using 4 spaces in both types of tasks is better because it's less error prone when someone is not sure if e.g. do_generate_toolchain_file() is Python or shell task and also allows to highlight every tab used in .bb, .inc, .bbappend, .bbclass as potentially bad (shouldn't be used for indenting of multiline variable assignments and cannot be used for Python tasks). * Don't indent closing quote on multiline variables we're quite inconsistent wheater it's first character on line under opening quote or under first non-whitespace character in previous line. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r--meta-oe/recipes-extended/atftp/atftp_git.bb8
-rw-r--r--meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb4
-rw-r--r--meta-oe/recipes-extended/dmidecode/dmidecode_2.10.bb4
-rw-r--r--meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb10
-rw-r--r--meta-oe/recipes-extended/hplip/hplip_3.12.6.bb6
-rw-r--r--meta-oe/recipes-extended/iotop/iotop_0.4.4.bb8
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc5.inc50
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb8
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb10
-rw-r--r--meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb2
-rw-r--r--meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb4
-rw-r--r--meta-oe/recipes-extended/net-snmp/net-snmp.inc56
-rw-r--r--meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb12
-rw-r--r--meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb2
-rw-r--r--meta-oe/recipes-extended/owfs/owfs_2.8p20.bb10
-rw-r--r--meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb4
-rw-r--r--meta-oe/recipes-extended/polkit/polkit_0.104.bb4
-rw-r--r--meta-oe/recipes-extended/redis/redis_2.6.9.bb2
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb24
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog.inc4
-rw-r--r--meta-oe/recipes-extended/sip/sip-native_4.14.2.bb16
-rw-r--r--meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb2
-rw-r--r--meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb4
-rw-r--r--meta-oe/recipes-extended/subsurface/subsurface_git.bb6
-rw-r--r--meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb4
-rw-r--r--meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb42
-rw-r--r--meta-oe/recipes-extended/tmux/tmux_1.6.bb2
-rw-r--r--meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb6
-rw-r--r--meta-oe/recipes-extended/zram/zram_0.1.bb12
-rw-r--r--meta-oe/recipes-extended/zsh/zsh.inc4
30 files changed, 165 insertions, 165 deletions
diff --git a/meta-oe/recipes-extended/atftp/atftp_git.bb b/meta-oe/recipes-extended/atftp/atftp_git.bb
index 67a2c1b4c..3e55881cf 100644
--- a/meta-oe/recipes-extended/atftp/atftp_git.bb
+++ b/meta-oe/recipes-extended/atftp/atftp_git.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://atftp.git.sourceforge.net/gitroot/atftp/atftp;protocol=git \
13 file://atftpd-0.7_unprotected_assignments_crash.patch \ 13 file://atftpd-0.7_unprotected_assignments_crash.patch \
14 file://atftpd.init \ 14 file://atftpd.init \
15 file://atftpd.service \ 15 file://atftpd.service \
16 " 16"
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
18 18
19inherit autotools update-rc.d useradd systemd 19inherit autotools update-rc.d useradd systemd
@@ -43,9 +43,9 @@ PACKAGES =+ "atftpd"
43FILES_${PN} = "${bindir}/*" 43FILES_${PN} = "${bindir}/*"
44 44
45FILES_${PN}d = "${sbindir}/* \ 45FILES_${PN}d = "${sbindir}/* \
46 ${sysconfdir}/init.d/* \ 46 ${sysconfdir}/init.d/* \
47 /srv/tftp \ 47 /srv/tftp \
48 ${systemd_unitdir}/system/atftpd.service \ 48 ${systemd_unitdir}/system/atftpd.service \
49" 49"
50 50
51SYSTEMD_PACKAGES = "${PN}d" 51SYSTEMD_PACKAGES = "${PN}d"
diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
index 7e0a4fb13..50202c1cb 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Data recovery tool" 1SUMMARY = "Data recovery tool"
2DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \ 2DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \
3 from one file or block device (hard disc, cdrom, etc) to another, \ 3 from one file or block device (hard disc, cdrom, etc) to another, \
4 trying hard to rescue data in case of read errors." 4 trying hard to rescue data in case of read errors."
5HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html" 5HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html"
6SECTION = "console" 6SECTION = "console"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
diff --git a/meta-oe/recipes-extended/dmidecode/dmidecode_2.10.bb b/meta-oe/recipes-extended/dmidecode/dmidecode_2.10.bb
index ae06de9cc..3437ef17a 100644
--- a/meta-oe/recipes-extended/dmidecode/dmidecode_2.10.bb
+++ b/meta-oe/recipes-extended/dmidecode/dmidecode_2.10.bb
@@ -10,11 +10,11 @@ SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
10COMPATIBLE_HOST = "(i.86|x86_64).*-linux" 10COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
11 11
12do_compile() { 12do_compile() {
13 oe_runmake 13 oe_runmake
14} 14}
15 15
16do_install() { 16do_install() {
17 oe_runmake DESTDIR="${D}" install 17 oe_runmake DESTDIR="${D}" install
18} 18}
19 19
20SRC_URI[md5sum] = "3c9c4d55a40b78600f3b43bfa64616f9" 20SRC_URI[md5sum] = "3c9c4d55a40b78600f3b43bfa64616f9"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb
index d922afc89..4ea312fea 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb
@@ -3,11 +3,11 @@ require gnuplot.inc
3PR = "r1" 3PR = "r1"
4 4
5SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \ 5SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \
6 http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ 6 http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
7 file://subdirs.patch \ 7 file://subdirs.patch \
8 file://gnuplot.desktop \ 8 file://gnuplot.desktop \
9 file://gnuplot.png \ 9 file://gnuplot.png \
10 file://automake-1.12.x.patch \ 10 file://automake-1.12.x.patch \
11" 11"
12 12
13SRC_URI[archive.md5sum] = "97a43328e81e57ebed7f135ca0c07e82" 13SRC_URI[archive.md5sum] = "97a43328e81e57ebed7f135ca0c07e82"
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
index b9c270da6..08735a0c9 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
@@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
8 file://setup-add-sleep-after-cups-reset.patch \ 8 file://setup-add-sleep-after-cups-reset.patch \
9 file://fix-libusb-paths.patch \ 9 file://fix-libusb-paths.patch \
10 file://cups-1.6.patch \ 10 file://cups-1.6.patch \
11 " 11"
12 12
13DEPENDS += "cups python libusb" 13DEPENDS += "cups python libusb"
14 14
@@ -34,7 +34,7 @@ EXTRA_OECONF += "\
34 --disable-foomatic-drv-install \ 34 --disable-foomatic-drv-install \
35 --enable-foomatic-ppd-install \ 35 --enable-foomatic-ppd-install \
36 --enable-foomatic-rip-hplip-install \ 36 --enable-foomatic-rip-hplip-install \
37 " 37"
38 38
39PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" 39PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal"
40 40
@@ -49,7 +49,7 @@ RDEPENDS_${PN} += " \
49 python-resource \ 49 python-resource \
50 python-terminal \ 50 python-terminal \
51 python-subprocess\ 51 python-subprocess\
52 " 52"
53 53
54# need to snag the debug file or OE will fail on backend package 54# need to snag the debug file or OE will fail on backend package
55FILES_${PN}-dbg += "\ 55FILES_${PN}-dbg += "\
diff --git a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
index 3b8150be9..14d2ee5e3 100644
--- a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Simple top-like I/O monitor" 1SUMMARY = "Simple top-like I/O monitor"
2DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \ 2DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \
3 It watches I/O usage information output by the Linux kernel and displays \ 3 It watches I/O usage information output by the Linux kernel and displays \
4 a table of current I/O usage by processes on the system." 4 a table of current I/O usage by processes on the system."
5HOMEPAGE = "http://guichaz.free.fr/iotop/" 5HOMEPAGE = "http://guichaz.free.fr/iotop/"
6 6
7PR = "r1" 7PR = "r1"
@@ -16,8 +16,8 @@ SRC_URI[sha256sum] = "46f3279fb1a7dfc129b5d00950c6e8389e4aedeb58880e848b88d68648
16inherit distutils 16inherit distutils
17 17
18do_install_append() { 18do_install_append() {
19 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true 19 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true
20 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true 20 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true
21} 21}
22 22
23RDEPENDS_${PN} = "python-distutils python-curses python-textutils \ 23RDEPENDS_${PN} = "python-distutils python-curses python-textutils \
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
index 4040870f1..f5a1f3c7b 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
@@ -19,29 +19,29 @@ LCD_DEFAULT_DRIVER ?= "curses"
19EXTRA_OECONF = "--enable-drivers=${LCD_DRIVERS} --enable-libusb" 19EXTRA_OECONF = "--enable-drivers=${LCD_DRIVERS} --enable-libusb"
20 20
21do_install () { 21do_install () {
22 # binaries 22 # binaries
23 install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd 23 install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
24 install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc 24 install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
25 25
26 # init scripts 26 # init scripts
27 install -d ${D}${sysconfdir}/init.d 27 install -d ${D}${sysconfdir}/init.d
28 # so far, not fixed :-( and now even uglier :-(( 28 # so far, not fixed :-( and now even uglier :-((
29 cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd 29 cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd
30 chmod 0755 ${D}${sysconfdir}/init.d/lcdd 30 chmod 0755 ${D}${sysconfdir}/init.d/lcdd
31 install -m 0755 scripts/init-lcdproc.debian ${D}${sysconfdir}/init.d/lcdproc 31 install -m 0755 scripts/init-lcdproc.debian ${D}${sysconfdir}/init.d/lcdproc
32 sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc 32 sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc
33 33
34 # configuration files 34 # configuration files
35 install -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf 35 install -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
36 sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf 36 sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf
37 sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf 37 sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf
38 install -m 0644 clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf 38 install -m 0644 clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
39 39
40 # driver library files 40 # driver library files
41 install -d ${D}${libdir}/lcdproc 41 install -d ${D}${libdir}/lcdproc
42 for i in server/drivers/*.so; do 42 for i in server/drivers/*.so; do
43 install -m 0644 $i ${D}${libdir}/lcdproc/ 43 install -m 0644 $i ${D}${libdir}/lcdproc/
44 done 44 done
45} 45}
46 46
47PACKAGES =+ "lcdd" 47PACKAGES =+ "lcdd"
@@ -49,8 +49,8 @@ PACKAGES =+ "lcdd"
49RRECOMMENDS_${PN} = "lcdd" 49RRECOMMENDS_${PN} = "lcdd"
50 50
51FILES_lcdd = "${sysconfdir}/LCDd.conf \ 51FILES_lcdd = "${sysconfdir}/LCDd.conf \
52 ${sbindir}/LCDd \ 52 ${sbindir}/LCDd \
53 ${sysconfdir}/init.d/lcdd" 53 ${sysconfdir}/init.d/lcdd"
54 54
55CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" 55CONFFILES_lcdd = "${sysconfdir}/LCDd.conf"
56CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf" 56CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf"
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
index 0276c55a9..39e607437 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
@@ -11,11 +11,11 @@ PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
11LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" 11LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
12 12
13do_install_append () { 13do_install_append () {
14 # binaries 14 # binaries
15 install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc 15 install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
16 16
17 # configuration files 17 # configuration files
18 install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf 18 install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
19} 19}
20 20
21PACKAGES =+ "lcdvc" 21PACKAGES =+ "lcdvc"
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
index c72e28dc9..72a8482d4 100644
--- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
@@ -4,10 +4,10 @@ LICENSE = "LGPLv2+ & GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" 4LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341"
5 5
6SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \ 6SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \
7 file://install.patch \ 7 file://install.patch \
8 file://configure.patch \ 8 file://configure.patch \
9 file://ldflags.patch \ 9 file://ldflags.patch \
10 " 10"
11 11
12SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8" 12SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8"
13SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f" 13SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f"
@@ -17,6 +17,6 @@ inherit autotools
17EXTRA_OECONF = "--enable-shared --enable-static" 17EXTRA_OECONF = "--enable-shared --enable-static"
18 18
19do_install () { 19do_install () {
20 oe_runmake 'ROOT=${D}' INSTGRP='' install 20 oe_runmake 'ROOT=${D}' INSTGRP='' install
21} 21}
22 22
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
index c06b9062e..77cca2b42 100644
--- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
+++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
@@ -15,7 +15,7 @@ BBCLASSEXTEND = "native"
15inherit autotools 15inherit autotools
16 16
17SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \ 17SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \
18 file://libwmf-0.2.8.4-intoverflow.patch \ 18 file://libwmf-0.2.8.4-intoverflow.patch \
19 file://libwmf-0.2.8.4-useafterfree.patch" 19 file://libwmf-0.2.8.4-useafterfree.patch"
20SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" 20SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0"
21SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" 21SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
index a80447f4c..1442d5af6 100644
--- a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
+++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
@@ -9,7 +9,7 @@ PR = "r3"
9SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \ 9SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \
10 file://mathview-gcc43x.diff \ 10 file://mathview-gcc43x.diff \
11 file://mathview-gcc47x.diff \ 11 file://mathview-gcc47x.diff \
12 " 12"
13SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299" 13SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299"
14SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43" 14SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43"
15 15
@@ -18,5 +18,5 @@ inherit autotools
18EXTRA_OECONF = "--disable-binreloc" 18EXTRA_OECONF = "--disable-binreloc"
19 19
20do_configure_prepend() { 20do_configure_prepend() {
21 sed -i -e s:AM_BINRELOC::g ${S}/configure.ac 21 sed -i -e s:AM_BINRELOC::g ${S}/configure.ac
22} 22}
diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp.inc b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
index e369ccf03..5a6ec9f16 100644
--- a/meta-oe/recipes-extended/net-snmp/net-snmp.inc
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
@@ -19,26 +19,26 @@ EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \
19${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" 19${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}"
20 20
21do_install () { 21do_install () {
22 oe_runmake install 22 oe_runmake install
23} 23}
24 24
25do_install_append() { 25do_install_append() {
26 install -d ${D}${sysconfdir}/snmp 26 install -d ${D}${sysconfdir}/snmp
27 install -d ${D}${sysconfdir}/init.d 27 install -d ${D}${sysconfdir}/init.d
28 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd 28 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
29 install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ 29 install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
30 install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ 30 install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
31 install -d ${STAGING_BINDIR} 31 install -d ${STAGING_BINDIR}
32 install -m 0755 ${D}${bindir}/net-snmp-config ${STAGING_BINDIR}/ 32 install -m 0755 ${D}${bindir}/net-snmp-config ${STAGING_BINDIR}/
33 sed -e "s@-I/usr/include@@g" \ 33 sed -e "s@-I/usr/include@@g" \
34 -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \ 34 -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
35 -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \ 35 -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
36 -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ 36 -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
37 -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ 37 -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
38 -i ${STAGING_BINDIR}/net-snmp-config 38 -i ${STAGING_BINDIR}/net-snmp-config
39 install -d ${D}${systemd_unitdir}/system 39 install -d ${D}${systemd_unitdir}/system
40 install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system 40 install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
41 install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system 41 install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
42} 42}
43 43
44PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-libs \ 44PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-libs \
@@ -48,13 +48,13 @@ ALLOW_EMPTY_${PN}-server = "1"
48FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" 48FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}"
49FILES_${PN}-mibs = "${datadir}/snmp/mibs" 49FILES_${PN}-mibs = "${datadir}/snmp/mibs"
50FILES_${PN}-server-snmpd = "${sbindir}/snmpd \ 50FILES_${PN}-server-snmpd = "${sbindir}/snmpd \
51 ${sysconfdir}/snmp/snmpd.conf \ 51 ${sysconfdir}/snmp/snmpd.conf \
52 ${sysconfdir}/init.d \ 52 ${sysconfdir}/init.d \
53 ${systemd_unitdir}/system/snmpd.service \ 53 ${systemd_unitdir}/system/snmpd.service \
54" 54"
55FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ 55FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \
56 ${sysconfdir}/snmp/snmptrapd.conf \ 56 ${sysconfdir}/snmp/snmptrapd.conf \
57 ${systemd_unitdir}/system/snmptrapd.service \ 57 ${systemd_unitdir}/system/snmptrapd.service \
58" 58"
59FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" 59FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/"
60FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" 60FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/"
@@ -86,10 +86,10 @@ RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
86LEAD_SONAME = "libnetsnmp.so" 86LEAD_SONAME = "libnetsnmp.so"
87 87
88pkg_postrm_${PN}-server() { 88pkg_postrm_${PN}-server() {
89 if test "x$D" != "x"; then 89 if test "x$D" != "x"; then
90 OPT="-r $D " 90 OPT="-r $D "
91 else 91 else
92 OPT="" 92 OPT=""
93 /etc/init.d/snmpd stop 93 /etc/init.d/snmpd stop
94 fi 94 fi
95} 95}
diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb b/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
index 74d006c09..14c103601 100644
--- a/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
@@ -18,12 +18,12 @@ EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no"
18EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" 18EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
19 19
20do_configure_prepend() { 20do_configure_prepend() {
21 gnu-configize -f 21 gnu-configize -f
22 # We better change sources and re-autoconf here, but 22 # We better change sources and re-autoconf here, but
23 # required autoconf is too new for us. 23 # required autoconf is too new for us.
24 sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \ 24 sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \
25 -e 's/tail -1/tail -n 1/g' \ 25 -e 's/tail -1/tail -n 1/g' \
26 -i configure 26 -i configure
27} 27}
28 28
29PARALLEL_MAKE = "" 29PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb b/meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
index a368887ab..fa9645a25 100644
--- a/meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
+++ b/meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://www.nazgul.ch/dev/${PN}-${PV}.tar.gz \
7 file://nhttpd.conf \ 7 file://nhttpd.conf \
8 file://volatiles \ 8 file://volatiles \
9 file://nostromo \ 9 file://nostromo \
10 " 10"
11 11
12TARGET_CC_ARCH += "${LDFLAGS}" 12TARGET_CC_ARCH += "${LDFLAGS}"
13 13
diff --git a/meta-oe/recipes-extended/owfs/owfs_2.8p20.bb b/meta-oe/recipes-extended/owfs/owfs_2.8p20.bb
index d010867c2..36772cfee 100644
--- a/meta-oe/recipes-extended/owfs/owfs_2.8p20.bb
+++ b/meta-oe/recipes-extended/owfs/owfs_2.8p20.bb
@@ -29,13 +29,13 @@ EXTRA_OECONF = " \
29 --disable-owphp \ 29 --disable-owphp \
30 --disable-owpython \ 30 --disable-owpython \
31 --disable-owperl \ 31 --disable-owperl \
32 " 32"
33 33
34do_install_prepend() { 34do_install_prepend() {
35 install -d ${D}${sysconfdir}/default/ 35 install -d ${D}${sysconfdir}/default/
36 install -d ${D}${sysconfdir}/init.d/ 36 install -d ${D}${sysconfdir}/init.d/
37 install -m 0755 ${WORKDIR}/owhttpd ${D}${sysconfdir}/init.d/owhttpd 37 install -m 0755 ${WORKDIR}/owhttpd ${D}${sysconfdir}/init.d/owhttpd
38 install -m 0755 ${WORKDIR}/owserver ${D}${sysconfdir}/init.d/owserver 38 install -m 0755 ${WORKDIR}/owserver ${D}${sysconfdir}/init.d/owserver
39} 39}
40 40
41PACKAGES =+ "owftpd owhttpd owserver owshell libowcapi libow libownet owmon owtap" 41PACKAGES =+ "owftpd owhttpd owserver owshell libowcapi libow libownet owmon owtap"
diff --git a/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb
index 7e9fc2b2c..df5c9a38a 100644
--- a/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \
8 file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795" 8 file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795"
9 9
10SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \ 10SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \
11 " 11"
12 12
13PR = "r2" 13PR = "r2"
14 14
@@ -21,6 +21,6 @@ inherit autotools gtk-doc pkgconfig
21 21
22FILES_${PN} += " ${datadir}/dbus-1 \ 22FILES_${PN} += " ${datadir}/dbus-1 \
23 ${datadir}/PolicyKit \ 23 ${datadir}/PolicyKit \
24 " 24"
25SRC_URI[md5sum] = "f6b485ffd7bd605af815fd2747180481" 25SRC_URI[md5sum] = "f6b485ffd7bd605af815fd2747180481"
26SRC_URI[sha256sum] = "81caa6972e651e90ef4ac31d7ed41bc79543d46b850dbd5b14b40f8ef7107d11" 26SRC_URI[sha256sum] = "81caa6972e651e90ef4ac31d7ed41bc79543d46b850dbd5b14b40f8ef7107d11"
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bb b/meta-oe/recipes-extended/polkit/polkit_0.104.bb
index cc39654fe..8a18692fd 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bb
@@ -23,7 +23,7 @@ SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.
23 file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \ 23 file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \
24 file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \ 24 file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \
25 file://obsolete_automake_macros.patch \ 25 file://obsolete_automake_macros.patch \
26 " 26"
27 27
28SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1" 28SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"
29SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9" 29SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9"
@@ -33,7 +33,7 @@ EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspectio
33inherit autotools gtk-doc pkgconfig 33inherit autotools gtk-doc pkgconfig
34 34
35do_install_append() { 35do_install_append() {
36 rm -f ${D}${libdir}/${BPN}-1/extensions/*.a 36 rm -f ${D}${libdir}/${BPN}-1/extensions/*.a
37} 37}
38 38
39FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \ 39FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \
diff --git a/meta-oe/recipes-extended/redis/redis_2.6.9.bb b/meta-oe/recipes-extended/redis/redis_2.6.9.bb
index f6818ee51..8f009757f 100644
--- a/meta-oe/recipes-extended/redis/redis_2.6.9.bb
+++ b/meta-oe/recipes-extended/redis/redis_2.6.9.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://redis.googlecode.com/files/redis-${PV}.tar.gz \
11 file://oe-use-libc-malloc.patch \ 11 file://oe-use-libc-malloc.patch \
12 file://redis.conf \ 12 file://redis.conf \
13 file://init-redis-server \ 13 file://init-redis-server \
14 " 14"
15 15
16inherit update-rc.d 16inherit update-rc.d
17 17
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
index 465ef8a18..b92fe2fb6 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.7.bb
@@ -11,7 +11,7 @@ PR = "r2"
11SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-${PV}.tar.gz \ 11SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-${PV}.tar.gz \
12 file://0001-rrdtool-eradicate-tcl-support.patch \ 12 file://0001-rrdtool-eradicate-tcl-support.patch \
13 file://remove_hardcoded_xml_include.patch \ 13 file://remove_hardcoded_xml_include.patch \
14 " 14"
15SRC_URI[md5sum] = "ffe369d8921b4dfdeaaf43812100c38f" 15SRC_URI[md5sum] = "ffe369d8921b4dfdeaaf43812100c38f"
16SRC_URI[sha256sum] = "956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11" 16SRC_URI[sha256sum] = "956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11"
17 17
@@ -20,17 +20,17 @@ inherit autotools gettext
20EXTRA_AUTORECONF = "-I m4" 20EXTRA_AUTORECONF = "-I m4"
21 21
22EXTRA_OECONF = " \ 22EXTRA_OECONF = " \
23 --enable-shared \ 23 --enable-shared \
24 --enable-local-libpng \ 24 --enable-local-libpng \
25 --enable-local-zlib \ 25 --enable-local-zlib \
26 --disable-libwrap \ 26 --disable-libwrap \
27 --program-prefix='' \ 27 --program-prefix='' \
28 rd_cv_ieee_works=yes \ 28 rd_cv_ieee_works=yes \
29 --disable-perl \ 29 --disable-perl \
30 --disable-python \ 30 --disable-python \
31 --disable-ruby \ 31 --disable-ruby \
32 --disable-lua \ 32 --disable-lua \
33 --disable-rpath \ 33 --disable-rpath \
34" 34"
35 35
36 36
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index dc6e51160..5cfd23616 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -15,8 +15,8 @@ inherit autotools systemd
15EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 15EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
16 16
17do_install_append() { 17do_install_append() {
18 install -d ${D}/${sysconfdir}/${PN} 18 install -d ${D}/${sysconfdir}/${PN}
19 install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf 19 install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
20} 20}
21 21
22CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" 22CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
diff --git a/meta-oe/recipes-extended/sip/sip-native_4.14.2.bb b/meta-oe/recipes-extended/sip/sip-native_4.14.2.bb
index 32579c0ef..33caa1edc 100644
--- a/meta-oe/recipes-extended/sip/sip-native_4.14.2.bb
+++ b/meta-oe/recipes-extended/sip/sip-native_4.14.2.bb
@@ -22,14 +22,14 @@ export STAGING_LIBDIR
22export STAGING_INCDIR 22export STAGING_INCDIR
23 23
24do_configure_prepend() { 24do_configure_prepend() {
25 cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro 25 cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
26} 26}
27do_install() { 27do_install() {
28 install -d ${D}${bindir} 28 install -d ${D}${bindir}
29 install -m 0755 sip ${D}${bindir}/sip 29 install -m 0755 sip ${D}${bindir}/sip
30 # python-pyqt expects sip4 30 # python-pyqt expects sip4
31 ln -sf sip ${D}${bindir}/sip4 31 ln -sf sip ${D}${bindir}/sip4
32 cd ${WORKDIR}/sip-${PV} && python configure.py 32 cd ${WORKDIR}/sip-${PV} && python configure.py
33 install -d ${D}${PYTHON_SITEPACKAGES_DIR} 33 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
34 install -m 0755 sip*.py ${D}${PYTHON_SITEPACKAGES_DIR} 34 install -m 0755 sip*.py ${D}${PYTHON_SITEPACKAGES_DIR}
35} 35}
diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
index 9feb52373..cf1aa664d 100644
--- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
+++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
@@ -9,7 +9,7 @@ DEPENDS = "libsocketcan"
9 9
10TAG = "canutils-${PV}" 10TAG = "canutils-${PV}"
11SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;tag=${TAG} \ 11SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;tag=${TAG} \
12 " 12"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb
index 89b4f0609..4c5f91896 100644
--- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb
+++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.8.bb
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38ad
8SRCREV = "3a2cec63a4e6212cc63d21008453bd799cfe8774" 8SRCREV = "3a2cec63a4e6212cc63d21008453bd799cfe8774"
9 9
10SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git \ 10SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git \
11 " 11"
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15inherit autotools pkgconfig 15inherit autotools pkgconfig
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 sed -i -e s:tests/GNUmakefile::g -e s:trunk:0.0.8: configure.ac 18 sed -i -e s:tests/GNUmakefile::g -e s:trunk:0.0.8: configure.ac
19} 19}
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
index d401c4e6f..8cdbf0034 100644
--- a/meta-oe/recipes-extended/subsurface/subsurface_git.bb
+++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
@@ -18,11 +18,11 @@ EXTRA_OEMAKE = "CC='${CC}' \
18 libdc-usr=${STAGING_INCDIR}/libdivecomputer/* \ 18 libdc-usr=${STAGING_INCDIR}/libdivecomputer/* \
19 LIBDIVECOMPUTERINCLUDES=${STAGING_INCDIR}/libdivecomputer \ 19 LIBDIVECOMPUTERINCLUDES=${STAGING_INCDIR}/libdivecomputer \
20 LIBDIVECOMPUTERARCHIVE=${STAGING_LIBDIR}/libdivecomputer.a \ 20 LIBDIVECOMPUTERARCHIVE=${STAGING_LIBDIR}/libdivecomputer.a \
21 " 21"
22 22
23do_install() { 23do_install() {
24 oe_runmake install DESTDIR=${D} 24 oe_runmake install DESTDIR=${D}
25 rm ${D}${datadir}/icons/hicolor/icon-theme.cache 25 rm ${D}${datadir}/icons/hicolor/icon-theme.cache
26} 26}
27 27
28FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg" 28FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg"
diff --git a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
index f905c9d63..c367a4d19 100644
--- a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
+++ b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
@@ -22,8 +22,8 @@ EXTRA_OECONF = "--with-x --without-athena"
22EXTRA_OEMAKE = "without_doc" 22EXTRA_OEMAKE = "without_doc"
23 23
24do_configure() { 24do_configure() {
25 rm -f ${S}/ac-tools/aclocal.m4 25 rm -f ${S}/ac-tools/aclocal.m4
26 autotools_do_configure 26 autotools_do_configure
27} 27}
28 28
29FILES_${PN} += " ${datadir}/t1lib/t1lib.config" 29FILES_${PN} += " ${datadir}/t1lib/t1lib.config"
diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
index bba89bff8..16ecdb025 100644
--- a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
+++ b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ 1DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \
2 The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ 2 The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \
3 It includes all features of 4.4BSD C shell, plus a command-line editor, \ 3 It includes all features of 4.4BSD C shell, plus a command-line editor, \
4 programmable word completion, spelling correction and more." 4 programmable word completion, spelling correction and more."
5 5
6HOMEPAGE = "http://www.tcsh.org/" 6HOMEPAGE = "http://www.tcsh.org/"
7LICENSE = "BSD" 7LICENSE = "BSD"
@@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780"
9SECTION = "base" 9SECTION = "base"
10DEPENDS = "ncurses" 10DEPENDS = "ncurses"
11SRC_URI = " \ 11SRC_URI = " \
12 ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \ 12 ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \
13 ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs \ 13 ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs \
14 file://01_build.1.patch \ 14 file://01_build.1.patch \
15 file://01_build.2.patch \ 15 file://01_build.2.patch \
16 file://01_build.3.patch \ 16 file://01_build.3.patch \
17 file://15_no-strip.patch \ 17 file://15_no-strip.patch \
18 file://disable-test-notty.patch \ 18 file://disable-test-notty.patch \
19 file://disable-test-nice.patch \ 19 file://disable-test-nice.patch \
20 file://disable-lexical.at-31.patch \ 20 file://disable-lexical.at-31.patch \
21 file://12_unknown_lscolors.patch \ 21 file://12_unknown_lscolors.patch \
22 file://tcsh-6.17.02-multibyte.patch \ 22 file://tcsh-6.17.02-multibyte.patch \
23 file://disable-broken-test.patch \ 23 file://disable-broken-test.patch \
24" 24"
25SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a" 25SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a"
26SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8" 26SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8"
@@ -30,14 +30,14 @@ SRC_URI[diffs.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9
30inherit autotools 30inherit autotools
31 31
32do_install_append () { 32do_install_append () {
33 oe_runmake install.man DESTDIR=${D} 33 oe_runmake install.man DESTDIR=${D}
34 34
35 install -d ${D}${base_bindir} 35 install -d ${D}${base_bindir}
36 ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh 36 ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh
37 37
38 install -d ${D}${sysconfdir}/csh/login.d 38 install -d ${D}${sysconfdir}/csh/login.d
39 install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} 39 install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir}
40 install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el 40 install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el
41} 41}
42 42
43FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" 43FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el"
diff --git a/meta-oe/recipes-extended/tmux/tmux_1.6.bb b/meta-oe/recipes-extended/tmux/tmux_1.6.bb
index 6be235553..470b25c05 100644
--- a/meta-oe/recipes-extended/tmux/tmux_1.6.bb
+++ b/meta-oe/recipes-extended/tmux/tmux_1.6.bb
@@ -14,5 +14,5 @@ SRC_URI[sha256sum] = "faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a
14inherit autotools 14inherit autotools
15 15
16do_configure_prepend () { 16do_configure_prepend () {
17 sed -i -e 's:-I/usr/local/include::' Makefile.am || bb_fatal "sed failed" 17 sed -i -e 's:-I/usr/local/include::' Makefile.am || bb_fatal "sed failed"
18} 18}
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
index 80b3c9a3b..8b3059db9 100644
--- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
6SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \ 6SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \
7 file://fix-ldflags.patch \ 7 file://fix-ldflags.patch \
8 file://unstrip.patch \ 8 file://unstrip.patch \
9 " 9"
10SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" 10SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a"
11SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" 11SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41"
12 12
@@ -15,11 +15,11 @@ PR = "r1"
15S = "${WORKDIR}/tools" 15S = "${WORKDIR}/tools"
16 16
17do_compile() { 17do_compile() {
18 oe_runmake 18 oe_runmake
19} 19}
20 20
21do_install() { 21do_install() {
22 oe_runmake install DESTDIR=${D} 22 oe_runmake install DESTDIR=${D}
23} 23}
24 24
25FILES_${PN} += "${libdir}" 25FILES_${PN} += "${libdir}"
diff --git a/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-oe/recipes-extended/zram/zram_0.1.bb
index 115e6437f..fbeb5860f 100644
--- a/meta-oe/recipes-extended/zram/zram_0.1.bb
+++ b/meta-oe/recipes-extended/zram/zram_0.1.bb
@@ -11,15 +11,15 @@ PR = "r3"
11SRC_URI = " \ 11SRC_URI = " \
12 file://init \ 12 file://init \
13 file://zram.service \ 13 file://zram.service \
14 " 14"
15 15
16do_install () { 16do_install () {
17 # Sysvinit 17 # Sysvinit
18 install -d ${D}${sysconfdir}/init.d 18 install -d ${D}${sysconfdir}/init.d
19 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram 19 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram
20 20
21 install -d ${D}${systemd_unitdir}/system 21 install -d ${D}${systemd_unitdir}/system
22 install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system 22 install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system
23} 23}
24 24
25FILES_${PN} = "${sysconfdir}/init.d" 25FILES_${PN} = "${sysconfdir}/init.d"
diff --git a/meta-oe/recipes-extended/zsh/zsh.inc b/meta-oe/recipes-extended/zsh/zsh.inc
index 9713cfc21..55812213a 100644
--- a/meta-oe/recipes-extended/zsh/zsh.inc
+++ b/meta-oe/recipes-extended/zsh/zsh.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF = " \
25 --disable-gdbm \ 25 --disable-gdbm \
26 --disable-dynamic \ 26 --disable-dynamic \
27 zsh_cv_shared_environ=yes \ 27 zsh_cv_shared_environ=yes \
28 " 28"
29 29
30ALTERNATIVE_${PN} = "sh" 30ALTERNATIVE_${PN} = "sh"
31ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" 31ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
@@ -53,4 +53,4 @@ FILES_${PN}-dbg += "\
53 ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \ 53 ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \
54 ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \ 54 ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \
55 ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \ 55 ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \
56 " 56"