summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
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-support
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-support')
-rw-r--r--meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb26
-rw-r--r--meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb6
-rw-r--r--meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb26
-rw-r--r--meta-oe/recipes-support/ckermit/ckermit_301.bb50
-rw-r--r--meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb6
-rw-r--r--meta-oe/recipes-support/cramfs/cramfs_1.1.bb8
-rw-r--r--meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb2
-rw-r--r--meta-oe/recipes-support/debianutils/debianutils_2.30.bb6
-rw-r--r--meta-oe/recipes-support/devicekit/devicekit-power_014.bb8
-rw-r--r--meta-oe/recipes-support/devmem2/devmem2.bb6
-rw-r--r--meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb8
-rw-r--r--meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb8
-rw-r--r--meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb2
-rw-r--r--meta-oe/recipes-support/emacs/emacs.inc188
-rw-r--r--meta-oe/recipes-support/enca/enca_1.9.bb16
-rw-r--r--meta-oe/recipes-support/espeak/espeak-data_1.37.bb18
-rw-r--r--meta-oe/recipes-support/espeak/espeak_1.37.bb40
-rw-r--r--meta-oe/recipes-support/farsight/farsight2_0.0.22.bb6
-rw-r--r--meta-oe/recipes-support/farsight/libnice_0.0.13.bb10
-rw-r--r--meta-oe/recipes-support/fbset/fbset_2.1.bb8
-rw-r--r--meta-oe/recipes-support/fbtest/fb-test_git.bb8
-rw-r--r--meta-oe/recipes-support/fftw/fftw.inc2
-rw-r--r--meta-oe/recipes-support/fftw/fftwf_3.3.3.bb4
-rw-r--r--meta-oe/recipes-support/flite/flite.inc8
-rw-r--r--meta-oe/recipes-support/fltk/fltk_1.1.10.bb2
-rw-r--r--meta-oe/recipes-support/fuse/fuse_2.9.2.bb4
-rw-r--r--meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb10
-rw-r--r--meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc2
-rw-r--r--meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb10
-rw-r--r--meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb14
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb4
-rw-r--r--meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc2
-rw-r--r--meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb2
-rw-r--r--meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb18
-rw-r--r--meta-oe/recipes-support/libftdi/libftdi_0.19.bb4
-rw-r--r--meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb8
-rw-r--r--meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb6
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc2
-rw-r--r--meta-oe/recipes-support/lzma/lzma.inc12
-rw-r--r--meta-oe/recipes-support/maliit/maliit-framework_git.bb10
-rw-r--r--meta-oe/recipes-support/maliit/maliit-plugins_git.bb4
-rw-r--r--meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb4
-rw-r--r--meta-oe/recipes-support/mime-support/mime-support_3.48.bb74
-rw-r--r--meta-oe/recipes-support/mini-iconv/mini-iconv.bb2
-rw-r--r--meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb10
-rw-r--r--meta-oe/recipes-support/mysql/mysql5_5.1.40.inc210
-rw-r--r--meta-oe/recipes-support/nmon/nmon_13g.bb6
-rw-r--r--meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb2
-rw-r--r--meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc94
-rw-r--r--meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb4
-rw-r--r--meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb20
-rw-r--r--meta-oe/recipes-support/opencv/opencv_2.4.3.bb8
-rw-r--r--meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb8
-rw-r--r--meta-oe/recipes-support/p910nd/p910nd_0.95.bb6
-rw-r--r--meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb8
-rw-r--r--meta-oe/recipes-support/picocom/picocom_1.6.bb4
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin.inc28
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb20
-rw-r--r--meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb10
-rw-r--r--meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb2
-rw-r--r--meta-oe/recipes-support/poppler/poppler.inc10
-rw-r--r--meta-oe/recipes-support/postgresql/postgresql.inc2
-rw-r--r--meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb4
-rw-r--r--meta-oe/recipes-support/rng-tools/rng-tools_2.bb12
-rw-r--r--meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb6
-rw-r--r--meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb6
-rw-r--r--meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb10
-rw-r--r--meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb42
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb20
-rw-r--r--meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb4
-rw-r--r--meta-oe/recipes-support/synergy/synergy_1.3.8.bb4
-rw-r--r--meta-oe/recipes-support/talloc/talloc_2.0.1.bb20
-rw-r--r--meta-oe/recipes-support/tbb/tbb_4.1.bb8
-rw-r--r--meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb34
-rw-r--r--meta-oe/recipes-support/toscoterm/toscoterm_git.bb10
-rw-r--r--meta-oe/recipes-support/upower/upower_0.9.14.bb8
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb2
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb4
-rw-r--r--meta-oe/recipes-support/vim/vim.inc52
-rw-r--r--meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb4
-rw-r--r--meta-oe/recipes-support/xchat/xchat_2.8.8.bb8
-rw-r--r--meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb42
82 files changed, 706 insertions, 710 deletions
diff --git a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb
index bd11f0da1c..5ab92fce7e 100644
--- a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb
+++ b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb
@@ -15,25 +15,25 @@ EXTRA_OECONF = "--enable-usb \
15 --with-distname=${DISTRO}" 15 --with-distname=${DISTRO}"
16 16
17do_configure() { 17do_configure() {
18 export topdir=${S} 18 export topdir=${S}
19 cp -a ${S}/autoconf/configure.in ${S} 19 cp -a ${S}/autoconf/configure.in ${S}
20 20
21 if ! [ -d ${S}/platforms/${DISTRO} ] ; then 21 if ! [ -d ${S}/platforms/${DISTRO} ] ; then
22 cp -a ${S}/platforms/unknown ${S}/platforms/${DISTRO} 22 cp -a ${S}/platforms/unknown ${S}/platforms/${DISTRO}
23 fi 23 fi
24 24
25 gnu-configize --force 25 gnu-configize --force
26 # install --help says '-c' is an ignored option, but it turns out that the argument to -c isn't ignored, so drop the complete '-c path/to/strip' line 26 # install --help says '-c' is an ignored option, but it turns out that the argument to -c isn't ignored, so drop the complete '-c path/to/strip' line
27 sed -i -e 's:$(INSTALL_PROGRAM) $(STRIP):$(INSTALL_PROGRAM):g' ${S}/autoconf/targets.mak 27 sed -i -e 's:$(INSTALL_PROGRAM) $(STRIP):$(INSTALL_PROGRAM):g' ${S}/autoconf/targets.mak
28 # Searching in host dirs triggers the QA checks 28 # Searching in host dirs triggers the QA checks
29 sed -i -e 's:-I/usr/local/include::g' -e 's:-L/usr/local/lib64::g' -e 's:-L/usr/local/lib::g' ${S}/configure 29 sed -i -e 's:-I/usr/local/include::g' -e 's:-L/usr/local/lib64::g' -e 's:-L/usr/local/lib::g' ${S}/configure
30 30
31 # m4 macros are missing, using autotools_do_configure leads to linking errors with gethostname_re 31 # m4 macros are missing, using autotools_do_configure leads to linking errors with gethostname_re
32 oe_runconf 32 oe_runconf
33} 33}
34 34
35do_install_append() { 35do_install_append() {
36 rm ${D}${datadir}/hal -rf 36 rm ${D}${datadir}/hal -rf
37} 37}
38 38
39 39
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb b/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
index 8e344fd78d..171d6a07cf 100644
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
+++ b/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb
@@ -1,12 +1,12 @@
1require ca-certificates-${PV}.inc 1require ca-certificates-${PV}.inc
2 2
3do_install() { 3do_install() {
4 install -d ${D}${bindir_crossscripts} 4 install -d ${D}${bindir_crossscripts}
5 install -m755 ${S}/sbin/update-ca-certificates ${D}${bindir_crossscripts} 5 install -m755 ${S}/sbin/update-ca-certificates ${D}${bindir_crossscripts}
6} 6}
7 7
8SYSROOT_PREPROCESS_FUNCS += "ca_certificates_sysroot_preprocess" 8SYSROOT_PREPROCESS_FUNCS += "ca_certificates_sysroot_preprocess"
9 9
10ca_certificates_sysroot_preprocess() { 10ca_certificates_sysroot_preprocess() {
11 sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} 11 sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
12} 12}
diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb b/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
index a1eb1c478e..504190fd59 100644
--- a/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
+++ b/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb
@@ -5,22 +5,22 @@ require ca-certificates-${PV}.inc
5inherit autotools 5inherit autotools
6 6
7do_install_prepend() { 7do_install_prepend() {
8 mkdir -p ${D}/usr/share/ca-certificates 8 mkdir -p ${D}/usr/share/ca-certificates
9 mkdir -p ${D}/usr/sbin 9 mkdir -p ${D}/usr/sbin
10 mkdir -p ${D}/etc/ssl/certs 10 mkdir -p ${D}/etc/ssl/certs
11 mkdir -p ${D}/etc/ca-certificates/update.d 11 mkdir -p ${D}/etc/ca-certificates/update.d
12} 12}
13 13
14do_install_append() { 14do_install_append() {
15 cd ${D}/usr/share/ca-certificates 15 cd ${D}/usr/share/ca-certificates
16 echo "# Lines starting with # will be ignored" > ${D}/etc/ca-certificates.conf 16 echo "# Lines starting with # will be ignored" > ${D}/etc/ca-certificates.conf
17 echo "# Lines starting with ! will remove certificate on next update" >> ${D}/etc/ca-certificates.conf 17 echo "# Lines starting with ! will remove certificate on next update" >> ${D}/etc/ca-certificates.conf
18 echo "#" >> ${D}/etc/ca-certificates.conf 18 echo "#" >> ${D}/etc/ca-certificates.conf
19 for crt in $(find . -type f -name '*.crt' -print) 19 for crt in $(find . -type f -name '*.crt' -print)
20 do 20 do
21 crt=$(echo $crt | sed -e 's/\.\///') 21 crt=$(echo $crt | sed -e 's/\.\///')
22 echo $crt >> ${D}/etc/ca-certificates.conf 22 echo $crt >> ${D}/etc/ca-certificates.conf
23 done 23 done
24} 24}
25 25
26pkg_postinst_${PN} () { 26pkg_postinst_${PN} () {
diff --git a/meta-oe/recipes-support/ckermit/ckermit_301.bb b/meta-oe/recipes-support/ckermit/ckermit_301.bb
index 4074cf09f7..c46369fe91 100644
--- a/meta-oe/recipes-support/ckermit/ckermit_301.bb
+++ b/meta-oe/recipes-support/ckermit/ckermit_301.bb
@@ -23,35 +23,35 @@ CKERMIT_ADDITIONAL_libc-uclibc = "-DNOARROWKEYS"
23TARGET_CC_ARCH += "${LDFLAGS}" 23TARGET_CC_ARCH += "${LDFLAGS}"
24 24
25do_compile () { 25do_compile () {
26 # The original makefile doesn't differentiate between CC and CC_FOR_BUILD, 26 # The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
27 # so we build wart manually. Note that you need a ckwart.o with the proper 27 # so we build wart manually. Note that you need a ckwart.o with the proper
28 # timestamp to make this hack work: 28 # timestamp to make this hack work:
29 ${BUILD_CC} -c ckwart.c 29 ${BUILD_CC} -c ckwart.c
30 ${BUILD_CC} -o wart ckwart.o 30 ${BUILD_CC} -o wart ckwart.o
31 ./wart ckcpro.w ckcpro.c 31 ./wart ckcpro.w ckcpro.c
32 32
33 # read ${S}/ckccfg.txt to understand this :-) 33 # read ${S}/ckccfg.txt to understand this :-)
34 oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \ 34 oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \
35 -DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \ 35 -DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \
36 -DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \ 36 -DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \
37 -DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \ 37 -DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \
38 -DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \ 38 -DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \
39 -DNOB_460K -DNOB_921K \ 39 -DNOB_460K -DNOB_921K \
40 -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \ 40 -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \
41 -DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \ 41 -DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \
42 -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \ 42 -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \
43 -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ 43 -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
44 -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ 44 -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
45 -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ 45 -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
46 ${CKERMIT_ADDITIONAL}" 46 ${CKERMIT_ADDITIONAL}"
47} 47}
48 48
49do_install () { 49do_install () {
50 install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR} 50 install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR}
51 oe_runmake 'DESTDIR=${D}' install 51 oe_runmake 'DESTDIR=${D}' install
52 # Fix up dangling symlink 52 # Fix up dangling symlink
53 rm ${D}${BINDIR}/kermit-sshsub 53 rm ${D}${BINDIR}/kermit-sshsub
54 (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) 54 (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb)
55} 55}
56 56
57SRC_URI[md5sum] = "59e80f909edf305933af8e0348dcc5d7" 57SRC_URI[md5sum] = "59e80f909edf305933af8e0348dcc5d7"
diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb
index 809a8a285e..bd631af8e6 100644
--- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb
+++ b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb
@@ -10,7 +10,7 @@ SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0"
10 10
11SRC_URI = "git://github.com/emagii/cpufrequtils.git \ 11SRC_URI = "git://github.com/emagii/cpufrequtils.git \
12 file://0001-dont-unset-cflags.patch \ 12 file://0001-dont-unset-cflags.patch \
13 " 13"
14 14
15CFLAGS_append_libc-uclibc = " ${@['-DNLS', '-UNLS']['${USE_NLS}' == 'no']} " 15CFLAGS_append_libc-uclibc = " ${@['-DNLS', '-UNLS']['${USE_NLS}' == 'no']} "
16 16
@@ -23,10 +23,10 @@ TARGET_CC_ARCH += "${LDFLAGS}"
23EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} LIBTOOL='${HOST_SYS}-libtool --tag cc' STRIPCMD=echo" 23EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} LIBTOOL='${HOST_SYS}-libtool --tag cc' STRIPCMD=echo"
24 24
25do_compile() { 25do_compile() {
26 oe_runmake 26 oe_runmake
27} 27}
28 28
29do_install() { 29do_install() {
30 oe_runmake -e install DESTDIR=${D} 30 oe_runmake -e install DESTDIR=${D}
31} 31}
32 32
diff --git a/meta-oe/recipes-support/cramfs/cramfs_1.1.bb b/meta-oe/recipes-support/cramfs/cramfs_1.1.bb
index aa397a9c4e..14d9754560 100644
--- a/meta-oe/recipes-support/cramfs/cramfs_1.1.bb
+++ b/meta-oe/recipes-support/cramfs/cramfs_1.1.bb
@@ -17,13 +17,13 @@ EXTRA_OEMAKE = "\
17" 17"
18 18
19do_compile_prepend() { 19do_compile_prepend() {
20 ln -sf GNUmakefile Makefile 20 ln -sf GNUmakefile Makefile
21} 21}
22 22
23do_install() { 23do_install() {
24 install -d ${D}${bindir} 24 install -d ${D}${bindir}
25 install mkcramfs ${D}${bindir} 25 install mkcramfs ${D}${bindir}
26 install cramfsck ${D}${bindir} 26 install cramfsck ${D}${bindir}
27} 27}
28 28
29BBCLASSEXTEND = "native" 29BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb
index 438d394e28..17ac2ad462 100644
--- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb
+++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb
@@ -28,4 +28,4 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \
28 kernel-module-md5 \ 28 kernel-module-md5 \
29 kernel-module-cbc \ 29 kernel-module-cbc \
30 kernel-module-sha256-generic \ 30 kernel-module-sha256-generic \
31 " 31"
diff --git a/meta-oe/recipes-support/debianutils/debianutils_2.30.bb b/meta-oe/recipes-support/debianutils/debianutils_2.30.bb
index 0a532e93bf..e6c03eb557 100644
--- a/meta-oe/recipes-support/debianutils/debianutils_2.30.bb
+++ b/meta-oe/recipes-support/debianutils/debianutils_2.30.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f
10inherit autotools 10inherit autotools
11 11
12do_configure_prepend() { 12do_configure_prepend() {
13 sed -i -e 's:tempfile.1 which.1:which.1:g' Makefile.am 13 sed -i -e 's:tempfile.1 which.1:which.1:g' Makefile.am
14} 14}
15 15
16do_install_append() { 16do_install_append() {
@@ -30,11 +30,9 @@ pkg_prerm_${PN} () {
30if [ "x$D" != "x" ]; then 30if [ "x$D" != "x" ]; then
31 echo "can't do u-a offline" ; exit 1 31 echo "can't do u-a offline" ; exit 1
32else 32else
33
34 for app in add-shell installkernel mkboot remove-shell run-parts savelog sensible-browser sensible-editor sensible-pager tempfile which ; do 33 for app in add-shell installkernel mkboot remove-shell run-parts savelog sensible-browser sensible-editor sensible-pager tempfile which ; do
35 update-alternatives --remove $app $app.${PN} 34 update-alternatives --remove $app $app.${PN}
36 done 35 done
37
38fi 36fi
39} 37}
40 38
@@ -42,7 +40,6 @@ pkg_postinst_${PN} () {
42if [ "x$D" != "x" ]; then 40if [ "x$D" != "x" ]; then
43 echo "can't do u-a offline" ; exit 1 41 echo "can't do u-a offline" ; exit 1
44else 42else
45
46 for app in add-shell installkernel mkboot remove-shell ; do 43 for app in add-shell installkernel mkboot remove-shell ; do
47 update-alternatives --install ${sbindir}/$app $app $app.${PN} 100 44 update-alternatives --install ${sbindir}/$app $app $app.${PN} 100
48 done 45 done
@@ -54,7 +51,6 @@ else
54 for app in run-parts tempfile ; do 51 for app in run-parts tempfile ; do
55 update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100 52 update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100
56 done 53 done
57
58fi 54fi
59} 55}
60 56
diff --git a/meta-oe/recipes-support/devicekit/devicekit-power_014.bb b/meta-oe/recipes-support/devicekit/devicekit-power_014.bb
index 069a5985fb..daf76d34d6 100644
--- a/meta-oe/recipes-support/devicekit/devicekit-power_014.bb
+++ b/meta-oe/recipes-support/devicekit/devicekit-power_014.bb
@@ -15,14 +15,14 @@ inherit autotools pkgconfig
15EXTRA_OECONF = " --with-backend=linux" 15EXTRA_OECONF = " --with-backend=linux"
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am 18 sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
19 sed -i -e 's: doc : :g' ${S}/Makefile.am 19 sed -i -e 's: doc : :g' ${S}/Makefile.am
20} 20}
21 21
22FILES_${PN} += "${datadir}/dbus-1/ \ 22FILES_${PN} += "${datadir}/dbus-1/ \
23 ${datadir}/polkit-1/ \ 23 ${datadir}/polkit-1/ \
24 ${base_libdir}/udev/* \ 24 ${base_libdir}/udev/* \
25 " 25"
26 26
27FILES_${PN}-dbg += "${base_libdir}/udev/.debug" 27FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
28 28
diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb
index b99752d478..0b45412269 100644
--- a/meta-oe/recipes-support/devmem2/devmem2.bb
+++ b/meta-oe/recipes-support/devmem2/devmem2.bb
@@ -10,12 +10,12 @@ S = "${WORKDIR}"
10CFLAGS += "-DFORCE_STRICT_ALIGNMENT" 10CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
11 11
12do_compile() { 12do_compile() {
13 ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} 13 ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS}
14} 14}
15 15
16do_install() { 16do_install() {
17 install -d ${D}${bindir} 17 install -d ${D}${bindir}
18 install devmem2 ${D}${bindir} 18 install devmem2 ${D}${bindir}
19} 19}
20 20
21SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d" 21SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d"
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb
index 4a830a36b2..ce6e566fa7 100644
--- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb
+++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb
@@ -9,10 +9,10 @@ FILESPATH =. "${FILE_DIRNAME}/${BPN}-${PV}:"
9SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch" 9SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch"
10 10
11do_deploy() { 11do_deploy() {
12 install -d ${DEPLOY_DIR_TOOLS} 12 install -d ${DEPLOY_DIR_TOOLS}
13 install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} 13 install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
14 rm -f ${DEPLOY_DIR_TOOLS}/dfu-util 14 rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
15 ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util 15 ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
16 16
17} 17}
18 18
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb
index c103509d13..4bed46aa70 100644
--- a/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb
+++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb
@@ -6,10 +6,10 @@ do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
6DEPENDS = "libusb-compat usbpath-native" 6DEPENDS = "libusb-compat usbpath-native"
7 7
8do_deploy() { 8do_deploy() {
9 install -d ${DEPLOY_DIR_TOOLS} 9 install -d ${DEPLOY_DIR_TOOLS}
10 install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} 10 install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
11 rm -f ${DEPLOY_DIR_TOOLS}/dfu-util 11 rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
12 ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util 12 ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
13 13
14} 14}
15 15
diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb b/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb
index 0ac8fa3281..26ab3b6e01 100644
--- a/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb
+++ b/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "14cfc584cd3714fe8c9a2cdc8388be49e08b5e395d95e6bcd11d4410e2
13 13
14EXTRA_OEMAKE = "ds9097 ds9097u \ 14EXTRA_OEMAKE = "ds9097 ds9097u \
15 SYSTYPE='Linux' \ 15 SYSTYPE='Linux' \
16 " 16"
17# Fix GNU_HASH QA errors 17# Fix GNU_HASH QA errors
18TARGET_CC_ARCH += "${CFLAGS} ${LDFLAGS}" 18TARGET_CC_ARCH += "${CFLAGS} ${LDFLAGS}"
19 19
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index a82371338a..5068596a16 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -9,11 +9,11 @@ DEPENDS += "qemu-native"
9DEPENDS +=" liblockfile" 9DEPENDS +=" liblockfile"
10 10
11X11DEPENDS = " \ 11X11DEPENDS = " \
12 libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \ 12 libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \
13 jpeg xz pixman libpng librsvg tiff libcroco \ 13 jpeg xz pixman libpng librsvg tiff libcroco \
14 libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \ 14 libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \
15 libxft libxpm libxrandr libxrender \ 15 libxft libxpm libxrandr libxrender \
16 gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \ 16 gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \
17" 17"
18 18
19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " 19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
@@ -45,100 +45,100 @@ QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} "
45export LOGNAME = "$(whoami)" 45export LOGNAME = "$(whoami)"
46 46
47do_compile_prepend() { 47do_compile_prepend() {
48 sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` 48 sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile`
49 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib" 49 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
50# Ugly hack, see files/use-qemu.patch for more: 50# Ugly hack, see files/use-qemu.patch for more:
51 ln -sf ../src/emacs lisp/emacs 51 ln -sf ../src/emacs lisp/emacs
52 ln -sf ../src/emacs lib-src/emacs 52 ln -sf ../src/emacs lib-src/emacs
53 ln -sf ../src/emacs leim/emacs 53 ln -sf ../src/emacs leim/emacs
54#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass 54#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass
55 treedir=${TREEDIR} 55 treedir=${TREEDIR}
56 if [ -e $treedir ];then 56 if [ -e $treedir ];then
57 rm -rf $treedir 57 rm -rf $treedir
58 fi 58 fi
59 59
60 mkdir -p $treedir/${base_libdir} 60 mkdir -p $treedir/${base_libdir}
61 61
62 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then 62 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then
63 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir} 63 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir}
64 fi 64 fi
65 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then 65 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then
66 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir} 66 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir}
67 fi 67 fi
68 # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails 68 # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
69 # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one 69 # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
70 if [ ! -f $treedir/${base_libdir}/libc.so ]; then 70 if [ ! -f $treedir/${base_libdir}/libc.so ]; then
71 ln -s libc.so.6 $treedir/${base_libdir}/libc.so 71 ln -s libc.so.6 $treedir/${base_libdir}/libc.so
72 fi 72 fi
73 73
74 # copy only as much stuff as we need 74 # copy only as much stuff as we need
75 # before: 5.5G ../../qemu-treedir/ 75 # before: 5.5G ../../qemu-treedir/
76 # after: 17M ../../qemu-treedir/ 76 # after: 17M ../../qemu-treedir/
77 cp -pPR \ 77 cp -pPR \
78 ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ 78 ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \
79 ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ 79 ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \
80 ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \ 80 ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \
81 ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \ 81 ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \
82 ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \ 82 ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \
83 ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \ 83 ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \
84 ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ 84 ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \
85 ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ 85 ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \
86 ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ 86 ${STAGING_DIR_TARGET}/${base_libdir}/librt* \
87 ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ 87 ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \
88 ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ 88 ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/
89 89
90 if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then 90 if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then
91 echo "X11 build enabled" 91 echo "X11 build enabled"
92 # copy only as much stuff as we need 92 # copy only as much stuff as we need
93 # before: 5.5G ../../qemu-treedir/ 93 # before: 5.5G ../../qemu-treedir/
94 # after: 86M ../../qemu-treedir/ 94 # after: 86M ../../qemu-treedir/
95 cp -pPR \ 95 cp -pPR \
96 ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ 96 ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \
97 ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ 97 ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \
98 ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ 98 ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \
99 ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ 99 ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \
100 ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ 100 ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \
101 ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ 101 ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \
102 ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ 102 ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \
103 ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ 103 ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \
104 ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ 104 ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \
105 ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ 105 ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \
106 ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ 106 ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \
107 ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ 107 ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \
108 ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ 108 ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \
109 ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ 109 ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
110 ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ 110 ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
111 ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ 111 ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
112 ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \ 112 ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \
113 ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ 113 ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
114 ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ 114 ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
115 ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ 115 ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
116 ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ 116 ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \
117 ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \ 117 ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \
118 ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \ 118 ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \
119 ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \ 119 ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \
120 ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \ 120 ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \
121 ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* \ 121 ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* \
122 ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/ 122 ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/
123 123
124 # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender 124 # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender
125 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ 125 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/
126 126
127 # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 127 # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11
128 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ 128 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/
129 129
130 # pango pangocairo pangoft2 130 # pango pangocairo pangoft2
131 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ 131 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/
132 132
133 # xcb-render xcb-shm xcb 133 # xcb-render xcb-shm xcb
134 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ 134 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/
135 fi 135 fi
136} 136}
137 137
138do_install_append() { 138do_install_append() {
139 # freaks package.bbclass and whole bitbake call returns error code 139 # freaks package.bbclass and whole bitbake call returns error code
140 # ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed 140 # ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed
141 mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO 141 mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO
142} 142}
143 143
144EXTRA_OEMAKE += 'QEMU="${QEMU}"' 144EXTRA_OEMAKE += 'QEMU="${QEMU}"'
diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.9.bb
index 5472af4e59..ba6d70df4c 100644
--- a/meta-oe/recipes-support/enca/enca_1.9.bb
+++ b/meta-oe/recipes-support/enca/enca_1.9.bb
@@ -6,10 +6,10 @@ LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" 6LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4"
7 7
8SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \ 8SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \
9 file://configure-hack.patch \ 9 file://configure-hack.patch \
10 file://dont-run-tests.patch \ 10 file://dont-run-tests.patch \
11 file://configure-remove-dumbness.patch \ 11 file://configure-remove-dumbness.patch \
12 file://makefile-remove-tools.patch " 12 file://makefile-remove-tools.patch "
13 13
14SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3" 14SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3"
15SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d" 15SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d"
@@ -19,13 +19,13 @@ inherit autotools
19EXTRA_OECONF = "--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" 19EXTRA_OECONF = "--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
20 20
21do_configure_prepend() { 21do_configure_prepend() {
22 # remove failing test which checks for something that isn't even used 22 # remove failing test which checks for something that isn't even used
23 sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac 23 sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac
24} 24}
25 25
26do_configure_append() { 26do_configure_append() {
27 sed -i s:-I/usr/include::g Makefile 27 sed -i s:-I/usr/include::g Makefile
28 sed -i s:-I/usr/include::g */Makefile 28 sed -i s:-I/usr/include::g */Makefile
29} 29}
30 30
31do_compile() { 31do_compile() {
diff --git a/meta-oe/recipes-support/espeak/espeak-data_1.37.bb b/meta-oe/recipes-support/espeak/espeak-data_1.37.bb
index d15d49690b..914bf36013 100644
--- a/meta-oe/recipes-support/espeak/espeak-data_1.37.bb
+++ b/meta-oe/recipes-support/espeak/espeak-data_1.37.bb
@@ -9,18 +9,18 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
9TARGET_ARCH = "${MACHINE_ARCH}" 9TARGET_ARCH = "${MACHINE_ARCH}"
10 10
11do_compile() { 11do_compile() {
12 # Fixing byte order of phoneme data files 12 # Fixing byte order of phoneme data files
13 cd "${S}/platforms/big_endian" 13 cd "${S}/platforms/big_endian"
14 sed -i '/^ *CC *=/d' Makefile 14 sed -i '/^ *CC *=/d' Makefile
15 sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c 15 sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c
16 oe_runmake 16 oe_runmake
17 ./espeak-phoneme-data "${S}/espeak-data" 17 ./espeak-phoneme-data "${S}/espeak-data"
18 cp -f phondata phonindex phontab "${S}/espeak-data" 18 cp -f phondata phonindex phontab "${S}/espeak-data"
19} 19}
20 20
21do_install() { 21do_install() {
22 install -d ${D}${layout_datadir}/espeak-data 22 install -d ${D}${layout_datadir}/espeak-data
23 install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data 23 install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data
24} 24}
25 25
26SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02" 26SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02"
diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb
index 6cc4cd4107..c7f4b521c3 100644
--- a/meta-oe/recipes-support/espeak/espeak_1.37.bb
+++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb
@@ -13,30 +13,30 @@ TARGET_CC_ARCH += "${LDFLAGS}"
13FILES_${PN} += "${datadir}/espeak-data" 13FILES_${PN} += "${datadir}/espeak-data"
14 14
15do_configure() { 15do_configure() {
16 # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19 16 # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19
17 cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h" 17 cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
18} 18}
19 19
20do_compile() { 20do_compile() {
21 cd src 21 cd src
22 oe_runmake 22 oe_runmake
23} 23}
24 24
25do_install() { 25do_install() {
26 install -d ${D}${bindir} 26 install -d ${D}${bindir}
27 install -d ${D}${libdir} 27 install -d ${D}${libdir}
28 install -d ${D}${includedir} 28 install -d ${D}${includedir}
29 install -d ${D}${datadir}/espeak-data 29 install -d ${D}${datadir}/espeak-data
30 30
31 # we do not ship "speak" binary though. 31 # we do not ship "speak" binary though.
32 install -m 0755 ${S}/src/espeak ${D}${bindir} 32 install -m 0755 ${S}/src/espeak ${D}${bindir}
33 install -m 0644 ${S}/src/speak_lib.h ${D}${includedir} 33 install -m 0644 ${S}/src/speak_lib.h ${D}${includedir}
34 oe_libinstall -so -C src libespeak ${D}${libdir} 34 oe_libinstall -so -C src libespeak ${D}${libdir}
35 35
36 if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then 36 if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then
37 # the big-endian phon* files are provided by the package espeak-data 37 # the big-endian phon* files are provided by the package espeak-data
38 rm -f ${S}/espeak-data/phon* 38 rm -f ${S}/espeak-data/phon*
39 fi 39 fi
40 40
41 cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data 41 cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data
42} 42}
diff --git a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb
index fe94fc4b19..5abf1d7d22 100644
--- a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb
+++ b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb
@@ -12,9 +12,9 @@ DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
12inherit autotools 12inherit autotools
13 13
14EXTRA_OECONF = " \ 14EXTRA_OECONF = " \
15 --disable-debug \ 15 --disable-debug \
16 --disable-gtk-doc \ 16 --disable-gtk-doc \
17 --disable-python \ 17 --disable-python \
18" 18"
19 19
20FILES_${PN} += "${libdir}/*/*.so" 20FILES_${PN} += "${libdir}/*/*.so"
diff --git a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb
index 48ca0a58fd..94ec9a2128 100644
--- a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb
+++ b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb
@@ -21,11 +21,11 @@ FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
21FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" 21FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
22 22
23do_compile_append() { 23do_compile_append() {
24 for i in $(find ${S} -name "*.pc") ; do 24 for i in $(find ${S} -name "*.pc") ; do
25 sed -i -e s:${STAGING_DIR_TARGET}::g \ 25 sed -i -e s:${STAGING_DIR_TARGET}::g \
26 -e s:/${TARGET_SYS}::g \ 26 -e s:/${TARGET_SYS}::g \
27 $i 27 $i
28 done 28 done
29} 29}
30 30
31 31
diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb
index 9fe2728d20..88d4f5eeae 100644
--- a/meta-oe/recipes-support/fbset/fbset_2.1.bb
+++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb
@@ -21,10 +21,10 @@ inherit autotools update-alternatives
21PARALLEL_MAKE = "" 21PARALLEL_MAKE = ""
22 22
23do_install() { 23do_install() {
24 install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5 24 install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5
25 install -m 0755 ${WORKDIR}/${P}/fbset ${D}${sbindir}/fbset.real 25 install -m 0755 ${WORKDIR}/${P}/fbset ${D}${sbindir}/fbset.real
26 install -m 0644 ${WORKDIR}/${P}/*.5 ${D}${datadir}/man/man5 26 install -m 0644 ${WORKDIR}/${P}/*.5 ${D}${datadir}/man/man5
27 install -m 0644 ${WORKDIR}/${P}/*.8 ${D}${datadir}/man/man8 27 install -m 0644 ${WORKDIR}/${P}/*.8 ${D}${datadir}/man/man8
28} 28}
29 29
30ALTERNATIVE_fbset = "fbset" 30ALTERNATIVE_fbset = "fbset"
diff --git a/meta-oe/recipes-support/fbtest/fb-test_git.bb b/meta-oe/recipes-support/fbtest/fb-test_git.bb
index 43acfd6b89..eea1be4d8b 100644
--- a/meta-oe/recipes-support/fbtest/fb-test_git.bb
+++ b/meta-oe/recipes-support/fbtest/fb-test_git.bb
@@ -11,9 +11,9 @@ SRC_URI = "git://github.com/prpplague/fb-test-app.git"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13do_install() { 13do_install() {
14 install -d ${D}${bindir} 14 install -d ${D}${bindir}
15 for prog in perf rect fb-test offset ; do 15 for prog in perf rect fb-test offset ; do
16 install -m 0755 $prog ${D}${bindir} 16 install -m 0755 $prog ${D}${bindir}
17 done 17 done
18} 18}
19 19
diff --git a/meta-oe/recipes-support/fftw/fftw.inc b/meta-oe/recipes-support/fftw/fftw.inc
index 80fc656abb..074a53b36f 100644
--- a/meta-oe/recipes-support/fftw/fftw.inc
+++ b/meta-oe/recipes-support/fftw/fftw.inc
@@ -12,7 +12,7 @@ S = "${WORKDIR}/fftw-${PV}"
12inherit autotools pkgconfig 12inherit autotools pkgconfig
13 13
14do_configure_prepend() { 14do_configure_prepend() {
15 echo 'AM_PROG_AS' >> ${S}/configure.ac 15 echo 'AM_PROG_AS' >> ${S}/configure.ac
16} 16}
17 17
18PACKAGES =+ "lib${PN}" 18PACKAGES =+ "lib${PN}"
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
index a7b8b6789f..e2989d6e34 100644
--- a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
+++ b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
@@ -1,8 +1,8 @@
1require fftw.inc 1require fftw.inc
2 2
3EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared \ 3EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared \
4 --enable-threads \ 4 --enable-threads \
5 ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \ 5 ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \
6" 6"
7 7
8SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2" 8SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2"
diff --git a/meta-oe/recipes-support/flite/flite.inc b/meta-oe/recipes-support/flite/flite.inc
index a0d718cb49..b9d5e5aa62 100644
--- a/meta-oe/recipes-support/flite/flite.inc
+++ b/meta-oe/recipes-support/flite/flite.inc
@@ -18,9 +18,9 @@ PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16"
18FILES_${PN} = "${bindir}" 18FILES_${PN} = "${bindir}"
19 19
20FILES_lib${PN} ="${libdir}/libflite.so.* \ 20FILES_lib${PN} ="${libdir}/libflite.so.* \
21 ${libdir}/libflite_cmu_time_awb.so.* \ 21 ${libdir}/libflite_cmu_time_awb.so.* \
22 ${libdir}/libflite_cmulex.so.* \ 22 ${libdir}/libflite_cmulex.so.* \
23 ${libdir}/libflite_usenglish.so.*" 23 ${libdir}/libflite_usenglish.so.*"
24 24
25FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*" 25FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*"
26 26
@@ -29,5 +29,5 @@ FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*"
29LEAD_SONAME = "libflite.so" 29LEAD_SONAME = "libflite.so"
30 30
31do_install() { 31do_install() {
32 oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install 32 oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install
33} 33}
diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
index bf218ee6e5..6b7a1afefa 100644
--- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
+++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb
@@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fl
12 file://disable_test.patch \ 12 file://disable_test.patch \
13 file://dso-fix.patch \ 13 file://dso-fix.patch \
14 file://libpng15.patch \ 14 file://libpng15.patch \
15 " 15"
16 16
17S = "${WORKDIR}/fltk-${PV}" 17S = "${WORKDIR}/fltk-${PV}"
18 18
diff --git a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb b/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
index b558c4dcfb..b6c2a9e53f 100644
--- a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse_2.9.2.bb
@@ -10,7 +10,7 @@ PR = "r1"
10SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \ 10SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \
11 file://gold-unversioned-symbol.patch \ 11 file://gold-unversioned-symbol.patch \
12 file://aarch64.patch \ 12 file://aarch64.patch \
13 " 13"
14SRC_URI[md5sum] = "7d80d0dc9cc2b9199a0c53787c151205" 14SRC_URI[md5sum] = "7d80d0dc9cc2b9199a0c53787c151205"
15SRC_URI[sha256sum] = "81a728fb3f87da33063068735e2fb7e2cd89df207d32687d3d3278385279cefc" 15SRC_URI[sha256sum] = "81a728fb3f87da33063068735e2fb7e2cd89df207d32687d3d3278385279cefc"
16 16
@@ -36,5 +36,5 @@ DEBIAN_NOAUTONAME_fuse-utils = "1"
36DEBIAN_NOAUTONAME_fuse-utils-dbg = "1" 36DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
37 37
38do_install_append() { 38do_install_append() {
39 rm -rf ${D}${base_prefix}/dev 39 rm -rf ${D}${base_prefix}/dev
40} 40}
diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb
index 5db2e61e54..ba8b6195ff 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb
@@ -3,11 +3,11 @@ require gsoap_${PV}.inc
3DEPENDS = "gsoap-native openssl" 3DEPENDS = "gsoap-native openssl"
4 4
5do_install_append() { 5do_install_append() {
6 install -d ${D}${libdir} 6 install -d ${D}${libdir}
7 for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck 7 for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck
8 do 8 do
9 oe_libinstall -C gsoap $lib ${D}${libdir} 9 oe_libinstall -C gsoap $lib ${D}${libdir}
10 done 10 done
11} 11}
12 12
13FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" 13FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2"
diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc
index 30cf9a6d41..9e2a7825f6 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b338b08b1b61e028e0f399a4de25e58f" 5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b338b08b1b61e028e0f399a4de25e58f"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.zip \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.zip \
8 " 8"
9 9
10inherit autotools 10inherit autotools
11 11
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
index 9483b5c17b..9da2ee0df9 100644
--- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
+++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta
10 file://hddtemp-0.3-beta15-autodetect-717479.patch \ 10 file://hddtemp-0.3-beta15-autodetect-717479.patch \
11 file://hddtemp.db \ 11 file://hddtemp.db \
12 file://init \ 12 file://init \
13 " 13"
14 14
15SRC_URI[md5sum] = "8b829339e1ae9df701684ec239021bb8" 15SRC_URI[md5sum] = "8b829339e1ae9df701684ec239021bb8"
16SRC_URI[sha256sum] = "618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b" 16SRC_URI[sha256sum] = "618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b"
@@ -22,10 +22,10 @@ inherit autotools gettext update-rc.d
22FILES_${PN} += "/usr/share/misc/hddtemp.db" 22FILES_${PN} += "/usr/share/misc/hddtemp.db"
23 23
24do_install_append() { 24do_install_append() {
25 install -d ${D}/usr/share/misc/ 25 install -d ${D}/usr/share/misc/
26 install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db 26 install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db
27 install -d ${D}${sysconfdir}/init.d 27 install -d ${D}${sysconfdir}/init.d
28 install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp 28 install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp
29} 29}
30 30
31INITSCRIPT_NAME = "hddtemp" 31INITSCRIPT_NAME = "hddtemp"
diff --git a/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb b/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb
index e504f61851..3d76f8b3cf 100644
--- a/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb
+++ b/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb
@@ -7,20 +7,20 @@ RDEPENDS_${PN} += "perl"
7 7
8SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/i2c-tools/i2c-tools-3.1.0.tar.bz2/f15019e559e378c6e9d5d6299a00df21/i2c-tools-${PV}.tar.bz2 \ 8SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/i2c-tools/i2c-tools-3.1.0.tar.bz2/f15019e559e378c6e9d5d6299a00df21/i2c-tools-${PV}.tar.bz2 \
9 file://Module.mk \ 9 file://Module.mk \
10 " 10"
11SRC_URI[md5sum] = "f15019e559e378c6e9d5d6299a00df21" 11SRC_URI[md5sum] = "f15019e559e378c6e9d5d6299a00df21"
12SRC_URI[sha256sum] = "960023f61de292c6dd757fcedec4bffa7dd036e8594e24b26a706094ca4c142a" 12SRC_URI[sha256sum] = "960023f61de292c6dd757fcedec4bffa7dd036e8594e24b26a706094ca4c142a"
13 13
14inherit autotools 14inherit autotools
15 15
16do_compile_prepend() { 16do_compile_prepend() {
17 cp ${WORKDIR}/Module.mk ${S}/eepromer/ 17 cp ${WORKDIR}/Module.mk ${S}/eepromer/
18 sed -i 's#/usr/local#/usr#' Makefile 18 sed -i 's#/usr/local#/usr#' Makefile
19 echo "include eepromer/Module.mk" >> Makefile 19 echo "include eepromer/Module.mk" >> Makefile
20} 20}
21 21
22do_install_append() { 22do_install_append() {
23 install -d ${D}${includedir}/linux 23 install -d ${D}${includedir}/linux
24 install -m 0644 include/linux/i2c-dev.h ${D}${includedir}/linux/i2c-dev-user.h 24 install -m 0644 include/linux/i2c-dev.h ${D}${includedir}/linux/i2c-dev-user.h
25 rm -f ${D}${includedir}/linux/i2c-dev.h 25 rm -f ${D}${includedir}/linux/i2c-dev.h
26} 26}
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
index 9f3d4eac4e..2f0fad5ea5 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
@@ -10,8 +10,8 @@ PR = "r5"
10PATCHSET = "6" 10PATCHSET = "6"
11SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ 11SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
12 file://PerlMagic_MakePatch.patch \ 12 file://PerlMagic_MakePatch.patch \
13 file://remove.dist-lzip.patch \ 13 file://remove.dist-lzip.patch \
14 " 14"
15SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a" 15SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a"
16SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80" 16SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80"
17 17
diff --git a/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc b/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc
index caf2b0b71e..264b49a538 100644
--- a/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc
+++ b/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc
@@ -40,7 +40,7 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \
40 --without-libradius \ 40 --without-libradius \
41 --without-gssapi \ 41 --without-gssapi \
42 --without-libpam \ 42 --without-libpam \
43 --disable-security-context" 43 --disable-security-context"
44 44
45# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 45# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527
46CFLAGS += "-fno-strict-aliasing" 46CFLAGS += "-fno-strict-aliasing"
diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
index 9e7d2fcd8c..e1e5ff28f7 100644
--- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
+++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
12inherit autotools lib_package 12inherit autotools lib_package
13 13
14do_install_append() { 14do_install_append() {
15 sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la 15 sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la
16} 16}
17 17
18PACKAGES =+ "${PN}-dev-vala" 18PACKAGES =+ "${PN}-dev-vala"
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index a6d68d4eb5..89cbce00ff 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -14,15 +14,15 @@ SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8"
14SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72" 14SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72"
15 15
16EXTRA_OECONF = "\ 16EXTRA_OECONF = "\
17 --enable-null \ 17 --enable-null \
18 --enable-alsa \ 18 --enable-alsa \
19 --enable-gstreamer \ 19 --enable-gstreamer \
20 --enable-pulse \ 20 --enable-pulse \
21 --disable-oss \ 21 --disable-oss \
22 --enable-gtk \ 22 --enable-gtk \
23 --enable-gtk3 \ 23 --enable-gtk3 \
24 --disable-tdb \ 24 --disable-tdb \
25 --disable-lynx \ 25 --disable-lynx \
26" 26"
27 27
28python populate_packages_prepend() { 28python populate_packages_prepend() {
diff --git a/meta-oe/recipes-support/libftdi/libftdi_0.19.bb b/meta-oe/recipes-support/libftdi/libftdi_0.19.bb
index 0bfbe2212d..2b8068bf56 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_0.19.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_0.19.bb
@@ -9,14 +9,14 @@ PR = "r1"
9LICENSE = "LGPLv2.1 GPLv2" 9LICENSE = "LGPLv2.1 GPLv2"
10LIC_FILES_CHKSUM= "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ 10LIC_FILES_CHKSUM= "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
11 file://COPYING.LIB;md5=db979804f025cf55aabec7129cb671ed \ 11 file://COPYING.LIB;md5=db979804f025cf55aabec7129cb671ed \
12 " 12"
13 13
14DEPENDS = "virtual/libusb0" 14DEPENDS = "virtual/libusb0"
15DEPENDS_virtclass-native = "virtual/libusb0-native" 15DEPENDS_virtclass-native = "virtual/libusb0-native"
16 16
17SRC_URI = "http://www.intra2net.com/en/developer/libftdi/download/libftdi-${PV}.tar.gz \ 17SRC_URI = "http://www.intra2net.com/en/developer/libftdi/download/libftdi-${PV}.tar.gz \
18 file://libtool-m4.patch \ 18 file://libtool-m4.patch \
19 " 19"
20SRC_URI[md5sum] = "e6e25f33b4327b1b7aa1156947da45f3" 20SRC_URI[md5sum] = "e6e25f33b4327b1b7aa1156947da45f3"
21SRC_URI[sha256sum] = "567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be" 21SRC_URI[sha256sum] = "567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be"
22 22
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
index ce4e316c59..09e5ec2b8e 100644
--- a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
+++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
@@ -8,7 +8,7 @@ PR = "r1"
8 8
9SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ 9SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
10 file://configure.patch \ 10 file://configure.patch \
11 " 11"
12 12
13S = "${WORKDIR}/SDL_ttf-${PV}" 13S = "${WORKDIR}/SDL_ttf-${PV}"
14EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config " 14EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config "
@@ -19,11 +19,11 @@ TARGET_CC_ARCH += "${LDFLAGS}"
19 19
20do_configure_prepend() { 20do_configure_prepend() {
21 21
22 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" 22 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
23 23
24 for i in ${MACROS}; do 24 for i in ${MACROS}; do
25 rm acinclude/$i 25 rm acinclude/$i
26 done 26 done
27 27
28} 28}
29 29
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
index 4f15535248..60df0c6c73 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
@@ -25,9 +25,9 @@ INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67"
25S = "${WORKDIR}/lm_sensors-${PV}" 25S = "${WORKDIR}/lm_sensors-${PV}"
26 26
27EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \ 27EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \
28 MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ 28 MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \
29 LIBDIR=${libdir} \ 29 LIBDIR=${libdir} \
30 CC="${CC}" AR="${AR}"' 30 CC="${CC}" AR="${AR}"'
31 31
32do_compile() { 32do_compile() {
33 oe_runmake user PROG_EXTRA="sensors sensord" 33 oe_runmake user PROG_EXTRA="sensors sensord"
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index b357fd988c..157e11b924 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-user= \
23 --enable-pkgconfig \ 23 --enable-pkgconfig \
24 --enable-dmeventd \ 24 --enable-dmeventd \
25 --with-udev-prefix= \ 25 --with-udev-prefix= \
26 " 26"
27 27
28inherit autotools 28inherit autotools
29 29
diff --git a/meta-oe/recipes-support/lzma/lzma.inc b/meta-oe/recipes-support/lzma/lzma.inc
index 75e6d6780a..912d281187 100644
--- a/meta-oe/recipes-support/lzma/lzma.inc
+++ b/meta-oe/recipes-support/lzma/lzma.inc
@@ -21,15 +21,15 @@ do_unpack_append() {
21} 21}
22 22
23do_compile() { 23do_compile() {
24 oe_runmake CFLAGS='${CFLAGS} -c' -C C/LzmaUtil 24 oe_runmake CFLAGS='${CFLAGS} -c' -C C/LzmaUtil
25 oe_runmake CXX_C='${CC} ${CFLAGS}' CXX='${CXX} ${CXXFLAGS}' \ 25 oe_runmake CXX_C='${CC} ${CFLAGS}' CXX='${CXX} ${CXXFLAGS}' \
26 -C CPP/7zip/Compress/LZMA_Alone 26 -C CPP/7zip/Compress/LZMA_Alone
27} 27}
28 28
29do_install() { 29do_install() {
30 install -d ${D}${bindir} ${D}${libdir} 30 install -d ${D}${bindir} ${D}${libdir}
31 install -m 0755 CPP/7zip/Compress/LZMA_Alone/lzma ${D}${bindir} 31 install -m 0755 CPP/7zip/Compress/LZMA_Alone/lzma ${D}${bindir}
32 oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir} 32 oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir}
33} 33}
34 34
35BBCLASSEXTEND = "native" 35BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/maliit/maliit-framework_git.bb b/meta-oe/recipes-support/maliit/maliit-framework_git.bb
index 2c4b0f8e8b..292856238d 100644
--- a/meta-oe/recipes-support/maliit/maliit-framework_git.bb
+++ b/meta-oe/recipes-support/maliit/maliit-framework_git.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://gitorious.org/maliit/maliit-framework.git;branch=master \
12 file://0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch \ 12 file://0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch \
13 file://0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch \ 13 file://0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch \
14 file://maliit-server.desktop \ 14 file://maliit-server.desktop \
15 " 15"
16 16
17SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc" 17SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc"
18PV = "0.92.3+git${SRCPV}" 18PV = "0.92.3+git${SRCPV}"
@@ -30,7 +30,7 @@ FILES_${PN} += "\
30 ${libdir}/maliit/plugins-*/factories/libmaliit-plugins-quick-factory-*.so \ 30 ${libdir}/maliit/plugins-*/factories/libmaliit-plugins-quick-factory-*.so \
31 ${libdir}/qt4/plugins/inputmethods/*.so \ 31 ${libdir}/qt4/plugins/inputmethods/*.so \
32 ${datadir}/applications/maliit-server.desktop \ 32 ${datadir}/applications/maliit-server.desktop \
33 " 33"
34 34
35FILES_${PN}-dbg += "\ 35FILES_${PN}-dbg += "\
36 ${libdir}/maliit-framework-tests \ 36 ${libdir}/maliit-framework-tests \
@@ -38,7 +38,7 @@ FILES_${PN}-dbg += "\
38 ${libdir}/maliit/plugins-*/factories/.debug \ 38 ${libdir}/maliit/plugins-*/factories/.debug \
39 ${libdir}/qt4/plugins/.debug \ 39 ${libdir}/qt4/plugins/.debug \
40 ${libdir}/qt4/plugins/inputmethods/.debug \ 40 ${libdir}/qt4/plugins/inputmethods/.debug \
41 " 41"
42 42
43FILES_${PN}-dev += "${datadir}/qt4" 43FILES_${PN}-dev += "${datadir}/qt4"
44 44
@@ -46,7 +46,7 @@ FILES_${PN}-gtk +="\
46 ${bindir}/maliit-exampleapp-gtk* \ 46 ${bindir}/maliit-exampleapp-gtk* \
47 \ 47 \
48 ${libdir}/gtk-*/*/immodules/libim-maliit.so\ 48 ${libdir}/gtk-*/*/immodules/libim-maliit.so\
49 " 49"
50 50
51EXTRA_QMAKEVARS_PRE = "\ 51EXTRA_QMAKEVARS_PRE = "\
52 PREFIX=${prefix} \ 52 PREFIX=${prefix} \
@@ -58,7 +58,7 @@ EXTRA_QMAKEVARS_PRE = "\
58 CONFIG+=disable-gtk-cache-update \ 58 CONFIG+=disable-gtk-cache-update \
59 CONFIG+=local-install \ 59 CONFIG+=local-install \
60 CONFIG+=nosdk \ 60 CONFIG+=nosdk \
61 " 61"
62 62
63EXTRA_OEMAKE += "INSTALL_ROOT=${D}" 63EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
64 64
diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
index 7a1a430d07..0fc7c680ea 100644
--- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
+++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
@@ -19,12 +19,12 @@ EXTRA_QMAKEVARS_PRE = "\
19 PREFIX=${prefix} \ 19 PREFIX=${prefix} \
20 LIBDIR=${libdir} \ 20 LIBDIR=${libdir} \
21 CONFIG+=nodoc \ 21 CONFIG+=nodoc \
22 " 22"
23 23
24FILES_${PN} += "\ 24FILES_${PN} += "\
25 ${libdir}/maliit \ 25 ${libdir}/maliit \
26 ${datadir} \ 26 ${datadir} \
27 " 27"
28 28
29FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug" 29FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug"
30 30
diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb
index 5dda2fbe58..dcd8a47d2d 100644
--- a/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb
+++ b/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "e708b66f6cec9ba090877e8eb38e5627ac69aea9ebd9bca1360a29c739
12inherit autotools 12inherit autotools
13 13
14do_configure() { 14do_configure() {
15 gnu-configize 15 gnu-configize
16 oe_runconf 16 oe_runconf
17} 17}
18 18
diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
index f281f6d802..e730102b12 100644
--- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
+++ b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
@@ -15,43 +15,43 @@ inherit allarch
15docdir_append = "/${PN}" 15docdir_append = "/${PN}"
16 16
17do_install () { 17do_install () {
18 install -d ${D}${sysconfdir} 18 install -d ${D}${sysconfdir}
19 install -d ${D}${libdir}/mime/packages 19 install -d ${D}${libdir}/mime/packages
20 install -d ${D}${docdir} 20 install -d ${D}${docdir}
21 install -d ${D}${sbindir} 21 install -d ${D}${sbindir}
22 install -d ${D}${bindir} 22 install -d ${D}${bindir}
23 install -d ${D}${mandir}/man1 23 install -d ${D}${mandir}/man1
24 install -d ${D}${mandir}/man5 24 install -d ${D}${mandir}/man5
25 install -d ${D}${mandir}/man8 25 install -d ${D}${mandir}/man8
26 install -m 644 mime.types ${D}${sysconfdir}/ 26 install -m 644 mime.types ${D}${sysconfdir}/
27 install -m 644 mailcap ${D}${libdir}/mime/ 27 install -m 644 mailcap ${D}${libdir}/mime/
28 install -m 644 mailcap.order ${D}${sysconfdir}/ 28 install -m 644 mailcap.order ${D}${sysconfdir}/
29 install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 29 install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5
30 install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 30 install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5
31# install -m 755 install-mime ${D}${sbindir}/ 31# install -m 755 install-mime ${D}${sbindir}/
32# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 32# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8
33 install -m 755 update-mime ${D}${sbindir}/ 33 install -m 755 update-mime ${D}${sbindir}/
34 install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 34 install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8
35 install -m 755 run-mailcap ${D}${bindir}/ 35 install -m 755 run-mailcap ${D}${bindir}/
36 install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 36 install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1
37# install -m 644 rfcs/* ${D}${docdir}/ 37# install -m 644 rfcs/* ${D}${docdir}/
38 install -m 644 debian/changelog ${D}${docdir}/changelog.Debian 38 install -m 644 debian/changelog ${D}${docdir}/changelog.Debian
39 install -m 644 debian/README ${D}${docdir}/copyright 39 install -m 644 debian/README ${D}${docdir}/copyright
40 install -m 755 debian-view ${D}${libdir}/mime/ 40 install -m 755 debian-view ${D}${libdir}/mime/
41 install -m 755 playaudio ${D}${libdir}/mime/ 41 install -m 755 playaudio ${D}${libdir}/mime/
42 install -m 755 playdsp ${D}${libdir}/mime/ 42 install -m 755 playdsp ${D}${libdir}/mime/
43 install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support 43 install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support
44 cd ${D}${mandir}; gzip -9fv */* 44 cd ${D}${mandir}; gzip -9fv */*
45 cd ${D}${docdir}; gzip -9v * 45 cd ${D}${docdir}; gzip -9v *
46 cd ${D}${docdir}; gunzip copyright.gz 46 cd ${D}${docdir}; gunzip copyright.gz
47 cd ${D}${bindir}; ln -s run-mailcap see 47 cd ${D}${bindir}; ln -s run-mailcap see
48 cd ${D}${bindir}; ln -s run-mailcap edit 48 cd ${D}${bindir}; ln -s run-mailcap edit
49 cd ${D}${bindir}; ln -s run-mailcap compose 49 cd ${D}${bindir}; ln -s run-mailcap compose
50 cd ${D}${bindir}; ln -s run-mailcap print 50 cd ${D}${bindir}; ln -s run-mailcap print
51 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz 51 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz
52 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz 52 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz
53 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz 53 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz
54 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz 54 cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz
55} 55}
56 56
57SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d" 57SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d"
diff --git a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
index 3150013fa3..56260975dc 100644
--- a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
+++ b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
@@ -17,5 +17,5 @@ SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aa
17S = "${WORKDIR}/${PN}" 17S = "${WORKDIR}/${PN}"
18 18
19do_install() { 19do_install() {
20 oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir} 20 oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir}
21} 21}
diff --git a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb
index b2bbfc4aa6..dcaf0c69c3 100644
--- a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb
+++ b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb
@@ -12,12 +12,12 @@ EXTRA_OEMAKE = ""
12EXTRA_OECONF = " --with-embedded-server " 12EXTRA_OECONF = " --with-embedded-server "
13 13
14do_install() { 14do_install() {
15 oe_runmake 'DESTDIR=${D}' install 15 oe_runmake 'DESTDIR=${D}' install
16 mv -f ${D}${libdir}/mysql/* ${D}${libdir} 16 mv -f ${D}${libdir}/mysql/* ${D}${libdir}
17 rmdir ${D}${libdir}/mysql 17 rmdir ${D}${libdir}/mysql
18 18
19 install -d ${D}${bindir} 19 install -d ${D}${bindir}
20 install -m 0755 sql/gen_lex_hash ${D}${bindir}/ 20 install -m 0755 sql/gen_lex_hash ${D}${bindir}/
21} 21}
22 22
23SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad" 23SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad"
diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
index af0ddbb5c0..3d79e193d6 100644
--- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
+++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
@@ -35,13 +35,13 @@ EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
35EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " 35EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
36 36
37do_configure_append() { 37do_configure_append() {
38 sed -i /comp_err/d ${S}/sql/share/Makefile 38 sed -i /comp_err/d ${S}/sql/share/Makefile
39 39
40 # handle distros with different values of ${libexecdir} 40 # handle distros with different values of ${libexecdir}
41 libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` 41 libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'`
42 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh 42 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh
43 sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh 43 sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh
44 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh 44 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh
45} 45}
46 46
47SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" 47SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess"
@@ -52,45 +52,45 @@ SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess"
52# plugindir is not fixed, but we don't create any plugins. 52# plugindir is not fixed, but we don't create any plugins.
53# 53#
54mysql5_sysroot_preprocess () { 54mysql5_sysroot_preprocess () {
55 sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config 55 sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
56 sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config 56 sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
57} 57}
58 58
59do_install() { 59do_install() {
60 oe_runmake 'DESTDIR=${D}' install 60 oe_runmake 'DESTDIR=${D}' install
61 mv -f ${D}${libdir}/mysql/* ${D}${libdir} 61 mv -f ${D}${libdir}/mysql/* ${D}${libdir}
62 rmdir ${D}${libdir}/mysql 62 rmdir ${D}${libdir}/mysql
63 63
64 install -d ${D}/etc/init.d 64 install -d ${D}/etc/init.d
65 install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ 65 install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/
66 install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld 66 install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld
67} 67}
68 68
69pkg_postinst_mysql5-server () { 69pkg_postinst_mysql5-server () {
70 if [ "x$D" != "x" ]; then 70 if [ "x$D" != "x" ]; then
71 exit 1 71 exit 1
72 fi 72 fi
73 73
74 grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql 74 grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql
75 75
76 #Install the database 76 #Install the database
77 test -d /usr/bin || mkdir -p /usr/bin 77 test -d /usr/bin || mkdir -p /usr/bin
78 test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname 78 test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname
79 mkdir /var/lib/mysql 79 mkdir /var/lib/mysql
80 chown mysql.nogroup /var/lib/mysql 80 chown mysql.nogroup /var/lib/mysql
81 81
82 mysql_install_db 82 mysql_install_db
83 83
84} 84}
85 85
86pkg_postrm_mysql5-server () { 86pkg_postrm_mysql5-server () {
87 grep mysql /etc/passwd && deluser mysql 87 grep mysql /etc/passwd && deluser mysql
88} 88}
89 89
90PACKAGES = "${PN}-dbg ${PN} \ 90PACKAGES = "${PN}-dbg ${PN} \
91libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ 91 libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \
92libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ 92 libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \
93${PN}-client ${PN}-server ${PN}-leftovers" 93 ${PN}-client ${PN}-server ${PN}-leftovers"
94CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" 94CONFFILES_${PN}-server += "${sysconfdir}/my.cnf"
95 95
96FILES_${PN} = " " 96FILES_${PN} = " "
@@ -98,95 +98,95 @@ RDEPENDS_${PN} = "${PN}-client ${PN}-server"
98ALLOW_EMPTY_${PN} = "1" 98ALLOW_EMPTY_${PN} = "1"
99 99
100FILES_libmysqlclient = "\ 100FILES_libmysqlclient = "\
101${libdir}/libmysqlclient.so.* \ 101 ${libdir}/libmysqlclient.so.* \
102${libdir}/plugin/*.so.*" 102 ${libdir}/plugin/*.so.*"
103FILES_libmysqlclient-dev = " \ 103FILES_libmysqlclient-dev = " \
104${includedir}/mysql/ \ 104 ${includedir}/mysql/ \
105${libdir}/libmysqlclient.so \ 105 ${libdir}/libmysqlclient.so \
106${libdir}/libmysqlclient.la \ 106 ${libdir}/libmysqlclient.la \
107${libdir}/plugin/*.so \ 107 ${libdir}/plugin/*.so \
108${libdir}/plugin/*.la \ 108 ${libdir}/plugin/*.la \
109${sysconfdir}/aclocal \ 109 ${sysconfdir}/aclocal \
110${bindir}/mysql_config" 110 ${bindir}/mysql_config"
111FILES_libmysqlclient-staticdev = "\ 111FILES_libmysqlclient-staticdev = "\
112${libdir}/*.a \ 112 ${libdir}/*.a \
113${libdir}/plugin/*.a" 113 ${libdir}/plugin/*.a"
114FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ 114FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \
115/usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" 115 /usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process"
116 116
117FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" 117FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*"
118FILES_libmysqlclient-r-dev = "\ 118FILES_libmysqlclient-r-dev = "\
119${libdir}/libmysqlclient_r.so \ 119 ${libdir}/libmysqlclient_r.so \
120${libdir}/libmysqlclient_r.la" 120 ${libdir}/libmysqlclient_r.la"
121FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" 121FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a"
122FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" 122FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*"
123 123
124FILES_${PN}-client = "\ 124FILES_${PN}-client = "\
125${bindir}/myisam_ftdump \ 125 ${bindir}/myisam_ftdump \
126${bindir}/mysql \ 126 ${bindir}/mysql \
127${bindir}/mysql_client_test \ 127 ${bindir}/mysql_client_test \
128${bindir}/mysql_client_test_embedded \ 128 ${bindir}/mysql_client_test_embedded \
129${bindir}/mysql_find_rows \ 129 ${bindir}/mysql_find_rows \
130${bindir}/mysql_fix_extensions \ 130 ${bindir}/mysql_fix_extensions \
131${bindir}/mysql_waitpid \ 131 ${bindir}/mysql_waitpid \
132${bindir}/mysqlaccess \ 132 ${bindir}/mysqlaccess \
133${bindir}/mysqladmin \ 133 ${bindir}/mysqladmin \
134${bindir}/mysqlbug \ 134 ${bindir}/mysqlbug \
135${bindir}/mysqlcheck \ 135 ${bindir}/mysqlcheck \
136${bindir}/mysqldump \ 136 ${bindir}/mysqldump \
137${bindir}/mysqldumpslow \ 137 ${bindir}/mysqldumpslow \
138${bindir}/mysqlimport \ 138 ${bindir}/mysqlimport \
139${bindir}/mysqlshow \ 139 ${bindir}/mysqlshow \
140${bindir}/mysqlslap \ 140 ${bindir}/mysqlslap \
141${bindir}/mysqltest_embedded \ 141 ${bindir}/mysqltest_embedded \
142${libexecdir}/mysqlmanager" 142 ${libexecdir}/mysqlmanager"
143 143
144FILES_${PN}-server = "\ 144FILES_${PN}-server = "\
145${bindir}/comp_err \ 145 ${bindir}/comp_err \
146${bindir}/isamchk \ 146 ${bindir}/isamchk \
147${bindir}/isamlog \ 147 ${bindir}/isamlog \
148${bindir}/msql2mysql \ 148 ${bindir}/msql2mysql \
149${bindir}/my_print_defaults \ 149 ${bindir}/my_print_defaults \
150${bindir}/myisamchk \ 150 ${bindir}/myisamchk \
151${bindir}/myisamlog \ 151 ${bindir}/myisamlog \
152${bindir}/myisampack \ 152 ${bindir}/myisampack \
153${bindir}/mysql_convert_table_format \ 153 ${bindir}/mysql_convert_table_format \
154${bindir}/mysql_fix_privilege_tables \ 154 ${bindir}/mysql_fix_privilege_tables \
155${bindir}/mysql_install_db \ 155 ${bindir}/mysql_install_db \
156${bindir}/mysql_secure_installation \ 156 ${bindir}/mysql_secure_installation \
157${bindir}/mysql_setpermission \ 157 ${bindir}/mysql_setpermission \
158${bindir}/mysql_tzinfo_to_sql \ 158 ${bindir}/mysql_tzinfo_to_sql \
159${bindir}/mysql_upgrade \ 159 ${bindir}/mysql_upgrade \
160${bindir}/mysql_zap \ 160 ${bindir}/mysql_zap \
161${bindir}/mysqlbinlog \ 161 ${bindir}/mysqlbinlog \
162${bindir}/mysqld_multi \ 162 ${bindir}/mysqld_multi \
163${bindir}/mysqld_safe \ 163 ${bindir}/mysqld_safe \
164${bindir}/mysqlhotcopy \ 164 ${bindir}/mysqlhotcopy \
165${bindir}/mysqltest \ 165 ${bindir}/mysqltest \
166${bindir}/ndb_delete_all \ 166 ${bindir}/ndb_delete_all \
167${bindir}/ndb_desc \ 167 ${bindir}/ndb_desc \
168${bindir}/ndb_drop_index \ 168 ${bindir}/ndb_drop_index \
169${bindir}/ndb_drop_table \ 169 ${bindir}/ndb_drop_table \
170${bindir}/ndb_mgm \ 170 ${bindir}/ndb_mgm \
171${bindir}/ndb_restore \ 171 ${bindir}/ndb_restore \
172${bindir}/ndb_select_all \ 172 ${bindir}/ndb_select_all \
173${bindir}/ndb_select_count \ 173 ${bindir}/ndb_select_count \
174${bindir}/ndb_show_tables \ 174 ${bindir}/ndb_show_tables \
175${bindir}/ndb_waiter \ 175 ${bindir}/ndb_waiter \
176${bindir}/pack_isam \ 176 ${bindir}/pack_isam \
177${bindir}/perror \ 177 ${bindir}/perror \
178${bindir}/replace \ 178 ${bindir}/replace \
179${bindir}/resolve_stack_dump \ 179 ${bindir}/resolve_stack_dump \
180${bindir}/resolveip \ 180 ${bindir}/resolveip \
181${libexecdir}/mysqld \ 181 ${libexecdir}/mysqld \
182${sbindir}/mysqld \ 182 ${sbindir}/mysqld \
183${sbindir}/ndb_cpcd \ 183 ${sbindir}/ndb_cpcd \
184${sbindir}/ndbd \ 184 ${sbindir}/ndbd \
185${sbindir}/ndb_mgmd \ 185 ${sbindir}/ndb_mgmd \
186${datadir}/mysql/ \ 186 ${datadir}/mysql/ \
187${localstatedir}/mysql/ \ 187 ${localstatedir}/mysql/ \
188${sysconfdir}/init.d \ 188 ${sysconfdir}/init.d \
189${sysconfdir}/my.cnf" 189 ${sysconfdir}/my.cnf"
190 190
191DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" 191DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}"
192FILES_${PN}-leftovers = "/" 192FILES_${PN}-leftovers = "/"
diff --git a/meta-oe/recipes-support/nmon/nmon_13g.bb b/meta-oe/recipes-support/nmon/nmon_13g.bb
index bc82c0ac67..38ea3e52fe 100644
--- a/meta-oe/recipes-support/nmon/nmon_13g.bb
+++ b/meta-oe/recipes-support/nmon/nmon_13g.bb
@@ -20,10 +20,10 @@ LDFLAGS += "-ltinfo -lncursesw"
20ASNEEDED_pn-nmon = "" 20ASNEEDED_pn-nmon = ""
21 21
22do_compile() { 22do_compile() {
23 ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon 23 ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon
24} 24}
25 25
26do_install() { 26do_install() {
27 install -d ${D}${bindir} 27 install -d ${D}${bindir}
28 install -m 0755 nmon ${D}${bindir} 28 install -m 0755 nmon ${D}${bindir}
29} 29}
diff --git a/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb b/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb
index 52fd1bfc9f..7d85016094 100644
--- a/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb
+++ b/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb
@@ -12,7 +12,7 @@ EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared"
12inherit autotools pkgconfig 12inherit autotools pkgconfig
13 13
14do_compile_prepend() { 14do_compile_prepend() {
15 sed -i -e 's:all-recursive:$(RECURSIVE_TARGETS):g' ${S}/Makefile 15 sed -i -e 's:all-recursive:$(RECURSIVE_TARGETS):g' ${S}/Makefile
16} 16}
17 17
18SRC_URI[md5sum] = "9356e5e9dcb3f1481977009720a2ccf8" 18SRC_URI[md5sum] = "9356e5e9dcb3f1481977009720a2ccf8"
diff --git a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
index bac1be1698..84846587b0 100644
--- a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
@@ -16,41 +16,41 @@ SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source
16noipv6 = "${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" 16noipv6 = "${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
17 17
18EXTRA_OECONF = " \ 18EXTRA_OECONF = " \
19 --with-libnet=${STAGING_BINDIR_CROSS} \ 19 --with-libnet=${STAGING_BINDIR_CROSS} \
20 --enable-dynamic-linking \ 20 --enable-dynamic-linking \
21 ${noipv6} \ 21 ${noipv6} \
22 --enable-ssl \ 22 --enable-ssl \
23 --disable-sub-streams \ 23 --disable-sub-streams \
24 --disable-pacct \ 24 --disable-pacct \
25 --disable-linux-caps \ 25 --disable-linux-caps \
26 --disable-pcre \ 26 --disable-pcre \
27 --disable-sql \ 27 --disable-sql \
28" 28"
29 29
30EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 30EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
31EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)}" 31EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)}"
32 32
33do_configure_prepend() { 33do_configure_prepend() {
34 eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" 34 eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}"
35} 35}
36 36
37# rename modules.conf because it breaks update-modules 37# rename modules.conf because it breaks update-modules
38# see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html 38# see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html
39do_install_append() { 39do_install_append() {
40 mv ${D}/${sysconfdir}/modules.conf ${D}/${sysconfdir}/scl-modules.conf 40 mv ${D}/${sysconfdir}/modules.conf ${D}/${sysconfdir}/scl-modules.conf
41 sed -i "s#@include 'modules.conf'#@include 'scl-modules.conf'#g" ${D}/${sysconfdir}/scl.conf 41 sed -i "s#@include 'modules.conf'#@include 'scl-modules.conf'#g" ${D}/${sysconfdir}/scl.conf
42 install -d ${D}/${sysconfdir}/${PN} 42 install -d ${D}/${sysconfdir}/${PN}
43 install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf 43 install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf
44 install -d ${D}/${sysconfdir}/init.d 44 install -d ${D}/${sysconfdir}/init.d
45 install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} 45 install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}
46} 46}
47 47
48FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ 48FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
49 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 49 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
50 ${base_bindir}/* ${base_sbindir}/* \ 50 ${base_bindir}/* ${base_sbindir}/* \
51 ${base_libdir}/*${SOLIBS} \ 51 ${base_libdir}/*${SOLIBS} \
52 ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ 52 ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \
53 ${datadir}/include/scl/ ${datadir}/xsd" 53 ${datadir}/include/scl/ ${datadir}/xsd"
54FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}" 54FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}"
55CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf" 55CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf"
56 56
@@ -60,39 +60,39 @@ RCONFLICTS_${PN} += "${PN}-systemd"
60SYSTEMD_SERVICE_${PN} = "${PN}.service" 60SYSTEMD_SERVICE_${PN} = "${PN}.service"
61 61
62pkg_postinst_${PN} () { 62pkg_postinst_${PN} () {
63 /etc/init.d/syslog stop 63 /etc/init.d/syslog stop
64 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 200 64 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 200
65 65
66 if test "x$D" != "x"; then 66 if test "x$D" != "x"; then
67 OPT="-r $D" 67 OPT="-r $D"
68 else 68 else
69 OPT="-s" 69 OPT="-s"
70 fi 70 fi
71 # remove all rc.d-links potentially created from alternative 71 # remove all rc.d-links potentially created from alternative
72 # syslog packages before creating new ones 72 # syslog packages before creating new ones
73 update-rc.d $OPT -f syslog remove 73 update-rc.d $OPT -f syslog remove
74 update-rc.d $OPT syslog start 20 2 3 4 5 . stop 90 0 1 6 . 74 update-rc.d $OPT syslog start 20 2 3 4 5 . stop 90 0 1 6 .
75} 75}
76 76
77pkg_prerm_${PN} () { 77pkg_prerm_${PN} () {
78 if test "x$D" = "x"; then 78 if test "x$D" = "x"; then
79 if test "$1" = "upgrade" -o "$1" = "remove"; then 79 if test "$1" = "upgrade" -o "$1" = "remove"; then
80 /etc/init.d/syslog stop 80 /etc/init.d/syslog stop
81 fi
82 fi 81 fi
82 fi
83 83
84 update-alternatives --remove syslog-init syslog.${PN} 84 update-alternatives --remove syslog-init syslog.${PN}
85} 85}
86 86
87pkg_postrm_${PN} () { 87pkg_postrm_${PN} () {
88 if test "x$D" != "x"; then 88 if test "x$D" != "x"; then
89 OPT="-r $D" 89 OPT="-r $D"
90 else 90 else
91 OPT="" 91 OPT=""
92 fi 92 fi
93 if test "$1" = "remove" -o "$1" = "purge"; then 93 if test "$1" = "remove" -o "$1" = "purge"; then
94 if ! test -e "/etc/init.d/syslog"; then 94 if ! test -e "/etc/init.d/syslog"; then
95 update-rc.d $OPT syslog remove 95 update-rc.d $OPT syslog remove
96 fi
97 fi 96 fi
97 fi
98} 98}
diff --git a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb
index 62faa83b2b..6d1fee7ae2 100644
--- a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb
+++ b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb
@@ -2,8 +2,8 @@ require syslog-ng.inc
2PR = "${INC_PR}.1" 2PR = "${INC_PR}.1"
3 3
4SRC_URI += " \ 4SRC_URI += " \
5 file://syslog-ng.conf \ 5 file://syslog-ng.conf \
6 file://initscript \ 6 file://initscript \
7" 7"
8 8
9SRC_URI[md5sum] = "60737452ce898f9dc7170dfdc9bfd732" 9SRC_URI[md5sum] = "60737452ce898f9dc7170dfdc9bfd732"
diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb
index 3d76226c23..50efd77bf0 100644
--- a/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a
9" 9"
10 10
11SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \
12 " 12"
13 13
14SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" 14SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe"
15SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" 15SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b"
@@ -18,23 +18,23 @@ S = "${WORKDIR}/OpenCV-${PV}"
18 18
19do_install() { 19do_install() {
20 cd samples/c 20 cd samples/c
21 install -d ${D}/${bindir} 21 install -d ${D}/${bindir}
22 install -d ${D}/${datadir}/opencv/samples 22 install -d ${D}/${datadir}/opencv/samples
23 23
24 cp * ${D}/${datadir}/opencv/samples || true 24 cp * ${D}/${datadir}/opencv/samples || true
25 25
26 for i in *.c; do 26 for i in *.c; do
27 echo "compiling $i" 27 echo "compiling $i"
28 ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true 28 ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true
29 install -m 0755 `basename $i .c` ${D}/${bindir} || true 29 install -m 0755 `basename $i .c` ${D}/${bindir} || true
30 rm ${D}/${datadir}/opencv/samples/`basename $i .c` || true 30 rm ${D}/${datadir}/opencv/samples/`basename $i .c` || true
31 done 31 done
32 for i in *.cpp; do 32 for i in *.cpp; do
33 echo "compiling $i" 33 echo "compiling $i"
34 ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true 34 ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true
35 install -m 0755 `basename $i .cpp` ${D}/${bindir} || true 35 install -m 0755 `basename $i .cpp` ${D}/${bindir} || true
36 rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true 36 rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true
37 done 37 done
38} 38}
39 39
40FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" 40FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*"
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb
index 916c8c57e3..39b608a334 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb
@@ -11,7 +11,7 @@ DEPENDS = "python-numpy v4l-utils libav gtk+ libtool swig swig-native python jpe
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \
13 file://opencv-fix-pkgconfig-generation.patch \ 13 file://opencv-fix-pkgconfig-generation.patch \
14 " 14"
15 15
16SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" 16SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe"
17SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" 17SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b"
@@ -32,7 +32,7 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
32 -DWITH_GTK=ON \ 32 -DWITH_GTK=ON \
33 -DCMAKE_SKIP_RPATH=ON \ 33 -DCMAKE_SKIP_RPATH=ON \
34 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ 34 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
35 " 35"
36 36
37inherit distutils-base pkgconfig cmake 37inherit distutils-base pkgconfig cmake
38 38
@@ -81,6 +81,6 @@ FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*"
81RDEPENDS_python-opencv = "python-core python-numpy" 81RDEPENDS_python-opencv = "python-core python-numpy"
82 82
83do_install_append() { 83do_install_append() {
84 cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ 84 cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
85 sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h 85 sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h
86} 86}
diff --git a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
index 98882462f7..f450949412 100644
--- a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
+++ b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
@@ -22,10 +22,10 @@ PACKAGES += "${PN}-bin"
22FILES_${PN}-bin = "${bindir}" 22FILES_${PN}-bin = "${bindir}"
23 23
24do_compile() { 24do_compile() {
25 ( 25 (
26 # HACK: build a native binaries need during the build 26 # HACK: build a native binaries need during the build
27 unset CC LD CXX CCLD CFLAGS 27 unset CC LD CXX CCLD CFLAGS
28 oe_runmake -C config/util CC="${BUILD_CC}" LD="${BUILD_LD}" CXX="${BUILD_CXX}" LIBS="" makestrs 28 oe_runmake -C config/util CC="${BUILD_CC}" LD="${BUILD_LD}" CXX="${BUILD_CXX}" LIBS="" makestrs
29 ) 29 )
30 if [ "$?" != "0" ]; then 30 if [ "$?" != "0" ]; then
31 exit 1 31 exit 1
diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb b/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
index 29051475fe..6880e1c9fc 100644
--- a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
+++ b/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
@@ -12,10 +12,10 @@ SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491"
12SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029" 12SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029"
13 13
14do_compile () { 14do_compile () {
15 ${CC} ${LDFLAGS} -o p910nd p910nd.c 15 ${CC} ${LDFLAGS} -o p910nd p910nd.c
16} 16}
17 17
18do_install () { 18do_install () {
19 install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd 19 install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd
20 install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf 20 install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf
21} 21}
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb
index 04ec03c9a8..266781a528 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb
@@ -13,10 +13,10 @@ PR = "r3"
13inherit autotools systemd 13inherit autotools systemd
14 14
15EXTRA_OECONF = " \ 15EXTRA_OECONF = " \
16 --disable-libusb \ 16 --disable-libusb \
17 --enable-libudev \ 17 --enable-libudev \
18 --enable-usbdropdir=${libdir}/pcsc/drivers \ 18 --enable-usbdropdir=${libdir}/pcsc/drivers \
19 " 19"
20 20
21S = "${WORKDIR}/pcsc-lite-${PV}" 21S = "${WORKDIR}/pcsc-lite-${PV}"
22 22
diff --git a/meta-oe/recipes-support/picocom/picocom_1.6.bb b/meta-oe/recipes-support/picocom/picocom_1.6.bb
index b7744aa179..9fdd9d682c 100644
--- a/meta-oe/recipes-support/picocom/picocom_1.6.bb
+++ b/meta-oe/recipes-support/picocom/picocom_1.6.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://picocom.googlecode.com/files/picocom-1.6.tar.gz"
9CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD' 9CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD'
10 10
11do_install () { 11do_install () {
12 install -d ${D}${bindir} 12 install -d ${D}${bindir}
13 install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}${bindir}/ 13 install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}${bindir}/
14} 14}
15 15
16SRC_URI[md5sum] = "426c3d30b82cbc80b0dafdccd6020c6c" 16SRC_URI[md5sum] = "426c3d30b82cbc80b0dafdccd6020c6c"
diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin.inc
index 340e7f2b05..bdeefa9be8 100644
--- a/meta-oe/recipes-support/pidgin/pidgin.inc
+++ b/meta-oe/recipes-support/pidgin/pidgin.inc
@@ -8,21 +8,21 @@ INC_PR = "r3"
8inherit autotools gettext pkgconfig gconf perlnative 8inherit autotools gettext pkgconfig gconf perlnative
9 9
10EXTRA_OECONF = " \ 10EXTRA_OECONF = " \
11 --enable-vv \ 11 --enable-vv \
12 --disable-perl \ 12 --disable-perl \
13 --disable-tcl \ 13 --disable-tcl \
14 --disable-gevolution \ 14 --disable-gevolution \
15 --disable-schemas-install \ 15 --disable-schemas-install \
16 --x-includes=${STAGING_INCDIR} \ 16 --x-includes=${STAGING_INCDIR} \
17 --x-libraries=${STAGING_LIBDIR} \ 17 --x-libraries=${STAGING_LIBDIR} \
18 --enable-gnutls=yes \ 18 --enable-gnutls=yes \
19 --with-ncurses-headers=${STAGING_INCDIR} \ 19 --with-ncurses-headers=${STAGING_INCDIR} \
20 --with-gnutls-includes=${STAGING_INCDIR} \ 20 --with-gnutls-includes=${STAGING_INCDIR} \
21 --with-gnutls-libs=${STAGING_LIBDIR} \ 21 --with-gnutls-libs=${STAGING_LIBDIR} \
22 " 22"
23 23
24do_configure_prepend() { 24do_configure_prepend() {
25 touch ${S}/po/Makefile 25 touch ${S}/po/Makefile
26} 26}
27 27
28OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" 28OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
@@ -50,7 +50,7 @@ FILES_finch-dbg = "${bindir}/.debug/finch \
50 ${libdir}/finch/.debug" 50 ${libdir}/finch/.debug"
51 51
52FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ 52FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
53 ${datadir}/applications" 53 ${datadir}/applications"
54RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" 54RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
55 55
56FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" 56FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons"
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb b/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb
index d229c15015..3ce3cc39a2 100644
--- a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb
@@ -4,20 +4,20 @@ PR = "${INC_PR}.3"
4DEPENDS += "farsight2 libidn" 4DEPENDS += "farsight2 libidn"
5 5
6SRC_URI = "\ 6SRC_URI = "\
7 ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ 7 ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
8 file://sanitize-configure.ac.patch \ 8 file://sanitize-configure.ac.patch \
9 file://pidgin.desktop-set-icon.patch \ 9 file://pidgin.desktop-set-icon.patch \
10 file://purple-OE-branding-25.patch \ 10 file://purple-OE-branding-25.patch \
11 file://pidgin-cross-python-265.patch \ 11 file://pidgin-cross-python-265.patch \
12" 12"
13 13
14SRC_URI[md5sum] = "9bc6cf953ed7d383b215fa8487bf8829" 14SRC_URI[md5sum] = "9bc6cf953ed7d383b215fa8487bf8829"
15SRC_URI[sha256sum] = "9722d7f199a6704e29900c80f270d9409d5c28caab77f495b68108d81ba3e19e" 15SRC_URI[sha256sum] = "9722d7f199a6704e29900c80f270d9409d5c28caab77f495b68108d81ba3e19e"
16 16
17EXTRA_OECONF += "\ 17EXTRA_OECONF += "\
18 --disable-gtkspell \ 18 --disable-gtkspell \
19 --disable-meanwhile \ 19 --disable-meanwhile \
20 --disable-nm \ 20 --disable-nm \
21 --disable-screensaver \ 21 --disable-screensaver \
22 --enable-nss=no \ 22 --enable-nss=no \
23" 23"
diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
index 59f22df3f1..bec82362f2 100644
--- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
+++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
@@ -10,13 +10,13 @@ SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee"
10SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f" 10SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f"
11 11
12do_compile() { 12do_compile() {
13 oe_runmake -f Makefile.unx INCS=-I${STAGING_DIR_HOST}${incdir} LIBS=${STAGING_DIR_HOST}${libdir}/libz.a 13 oe_runmake -f Makefile.unx INCS=-I${STAGING_DIR_HOST}${incdir} LIBS=${STAGING_DIR_HOST}${libdir}/libz.a
14} 14}
15 15
16do_install() { 16do_install() {
17 install -d ${D}${bindir} 17 install -d ${D}${bindir}
18 install pngcheck ${D}${bindir} 18 install pngcheck ${D}${bindir}
19 install png-fix-IDAT-windowsize ${D}${bindir} 19 install png-fix-IDAT-windowsize ${D}${bindir}
20 install pngsplit ${D}${bindir} 20 install pngsplit ${D}${bindir}
21} 21}
22 22
diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
index cbb02b478f..56a30e4e52 100644
--- a/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
+++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb
@@ -11,7 +11,7 @@ do_compile() {
11} 11}
12 12
13do_install() { 13do_install() {
14 oe_runmake install DESTDIR=${D} 14 oe_runmake install DESTDIR=${D}
15} 15}
16 16
17FILES_${PN} += "${datadir}" 17FILES_${PN} += "${datadir}"
diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
index a624c1b95e..d0c0074f9c 100644
--- a/meta-oe/recipes-support/poppler/poppler.inc
+++ b/meta-oe/recipes-support/poppler/poppler.inc
@@ -8,11 +8,11 @@ SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
8inherit autotools pkgconfig 8inherit autotools pkgconfig
9 9
10EXTRA_OECONF = "\ 10EXTRA_OECONF = "\
11 --enable-xpdf-headers \ 11 --enable-xpdf-headers \
12 --disable-gtk-test \ 12 --disable-gtk-test \
13 --disable-poppler-qt \ 13 --disable-poppler-qt \
14 --disable-poppler-qt4 \ 14 --disable-poppler-qt4 \
15 --enable-zlib \ 15 --enable-zlib \
16" 16"
17 17
18# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 18# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index 4e7aec2e34..4fda67b4b8 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -22,7 +22,7 @@ EXTRA_OECONF_sh4 = "--disable-spinlocks --disable-rpath"
22EXTRA_OECONF_aarch64 += "--disable-spinlocks" 22EXTRA_OECONF_aarch64 += "--disable-spinlocks"
23 23
24do_compile_append() { 24do_compile_append() {
25 cp /usr/sbin/zic ${S}/src/timezone/ 25 cp /usr/sbin/zic ${S}/src/timezone/
26} 26}
27 27
28SSTATE_SCAN_FILES += "Makefile.global" 28SSTATE_SCAN_FILES += "Makefile.global"
diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
index d5a5b4ba9e..3241b83a0b 100644
--- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
+++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
@@ -17,8 +17,8 @@ do_compile() {
17} 17}
18 18
19do_install() { 19do_install() {
20 install -d ${D}${sbindir}/ 20 install -d ${D}${sbindir}/
21 install -m 0755 pxaregs ${D}${sbindir}/ 21 install -m 0755 pxaregs ${D}${sbindir}/
22} 22}
23 23
24SRC_URI[md5sum] = "a43baa88842cd5926dbffb6fb87624f6" 24SRC_URI[md5sum] = "a43baa88842cd5926dbffb6fb87624f6"
diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
index ef753cff8d..cccc6a59d6 100644
--- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
+++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb
@@ -13,13 +13,13 @@ SRC_URI[sha256sum] = "1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25
13inherit autotools update-rc.d 13inherit autotools update-rc.d
14 14
15do_install_append() { 15do_install_append() {
16 install -d "${D}${sysconfdir}/init.d" 16 install -d "${D}${sysconfdir}/init.d"
17 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools 17 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
18 sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \ 18 sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \
19 ${D}${sysconfdir}/init.d/rng-tools 19 ${D}${sysconfdir}/init.d/rng-tools
20 20
21 install -d "${D}${sysconfdir}/default" 21 install -d "${D}${sysconfdir}/default"
22 install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default 22 install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default
23} 23}
24 24
25INITSCRIPT_NAME = "rng-tools" 25INITSCRIPT_NAME = "rng-tools"
diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
index d46580338a..ca98ab5ced 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
@@ -11,10 +11,10 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http"
11S = "${WORKDIR}/gpio" 11S = "${WORKDIR}/gpio"
12 12
13do_compile() { 13do_compile() {
14 ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c 14 ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c
15} 15}
16 16
17do_install() { 17do_install() {
18 install -d ${D}${sbindir} 18 install -d ${D}${sbindir}
19 install -m 0755 ${PN} ${D}${sbindir} 19 install -m 0755 ${PN} ${D}${sbindir}
20} 20}
diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
index 96285e9444..a0dbef4684 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
@@ -11,10 +11,10 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http"
11S = "${WORKDIR}/gpio" 11S = "${WORKDIR}/gpio"
12 12
13do_compile() { 13do_compile() {
14 ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio-s3c6410.c 14 ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio-s3c6410.c
15} 15}
16 16
17do_install() { 17do_install() {
18 install -d ${D}${sbindir} 18 install -d ${D}${sbindir}
19 install -m 0755 ${PN} ${D}${sbindir} 19 install -m 0755 ${PN} ${D}${sbindir}
20} 20}
diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
index 9e0c087d45..a6ec087d01 100644
--- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
+++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
@@ -16,17 +16,17 @@ do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
16CFLAGS += "-DLINUX_PPDEV" 16CFLAGS += "-DLINUX_PPDEV"
17 17
18do_compile() { 18do_compile() {
19 oe_runmake 19 oe_runmake
20} 20}
21 21
22do_install() { 22do_install() {
23 install -d ${D}/${bindir} 23 install -d ${D}/${bindir}
24 install -m 0755 sjf2410 ${D}/${bindir} 24 install -m 0755 sjf2410 ${D}/${bindir}
25} 25}
26 26
27do_deploy() { 27do_deploy() {
28 install -d ${DEPLOY_DIR_TOOLS} 28 install -d ${DEPLOY_DIR_TOOLS}
29 install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV} 29 install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV}
30} 30}
31 31
32addtask deploy before do_build after do_install 32addtask deploy before do_build after do_install
diff --git a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb
index 733bb9e0f7..54b59bf0e6 100644
--- a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb
+++ b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=10;md5=e98469a8efa024a
8PR = "r7" 8PR = "r7"
9 9
10SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ 10SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
11 file://mainmk_build_dynamic.patch \ 11 file://mainmk_build_dynamic.patch \
12 file://mainmk_no_tcl.patch \ 12 file://mainmk_no_tcl.patch \
13 file://sqlite.pc" 13 file://sqlite.pc"
14 14
15SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ 15SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \
16 expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \ 16 expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \
@@ -26,27 +26,27 @@ do_configure() {
26} 26}
27 27
28do_compile() { 28do_compile() {
29 oe_runmake -f Makefile.linux-gcc \ 29 oe_runmake -f Makefile.linux-gcc \
30 TOP="${S}" \ 30 TOP="${S}" \
31 BCC="${BUILD_CC}" \ 31 BCC="${BUILD_CC}" \
32 TCC="${CC}" \ 32 TCC="${CC}" \
33 OPTS="-fPIC -D'INTPTR_TYPE=int'" \ 33 OPTS="-fPIC -D'INTPTR_TYPE=int'" \
34 TCL_FLAGS= LIBTCL= \ 34 TCL_FLAGS= LIBTCL= \
35 READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ 35 READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \
36 LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" 36 LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses"
37} 37}
38 38
39do_install() { 39do_install() {
40 install -d ${D}${libdir} ${D}${bindir} 40 install -d ${D}${libdir} ${D}${bindir}
41 install sqlite ${D}${bindir} 41 install sqlite ${D}${bindir}
42 install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 42 install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6
43 ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so 43 ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so
44 ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 44 ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0
45 ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 45 ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8
46 install -d ${D}${includedir} 46 install -d ${D}${includedir}
47 install -m 0644 sqlite.h ${D}${includedir}/sqlite.h 47 install -m 0644 sqlite.h ${D}${includedir}/sqlite.h
48 install -d ${D}${libdir}/pkgconfig 48 install -d ${D}${libdir}/pkgconfig
49 install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc 49 install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc
50} 50}
51 51
52PACKAGES += "${PN}-bin" 52PACKAGES += "${PN}-bin"
diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
index 9b1084aeb9..f8a1ef48a5 100644
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
@@ -15,17 +15,17 @@ inherit autotools gettext
15S = "${WORKDIR}/dpkg-${PV}" 15S = "${WORKDIR}/dpkg-${PV}"
16 16
17EXTRA_OECONF = " \ 17EXTRA_OECONF = " \
18 --with-start-stop-daemon \ 18 --with-start-stop-daemon \
19 --without-bz2 \ 19 --without-bz2 \
20 --without-deselect \ 20 --without-deselect \
21 --without-install-info \ 21 --without-install-info \
22 --without-selinux \ 22 --without-selinux \
23 --without-update-alternatives \ 23 --without-update-alternatives \
24" 24"
25 25
26do_install_append () { 26do_install_append () {
27 # remove everything that is not related to start-stop-daemon, since there 27 # remove everything that is not related to start-stop-daemon, since there
28 # is no explicit rule for only installing ssd 28 # is no explicit rule for only installing ssd
29 find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \; 29 find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \;
30 find ${D} -depth -type d -empty -exec rmdir {} \; 30 find ${D} -depth -type d -empty -exec rmdir {} \;
31} 31}
diff --git a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
index 2713f5b18c..eb49494eff 100644
--- a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
+++ b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
@@ -12,8 +12,8 @@ SRC_URI[md5sum] = "c8b861305def7c0abae04f7bbefec212"
12SRC_URI[sha256sum] = "efc13c86e715b5e596d9d8535640c830f83e977fe521afd2c70d68926c4b573e" 12SRC_URI[sha256sum] = "efc13c86e715b5e596d9d8535640c830f83e977fe521afd2c70d68926c4b573e"
13 13
14EXTRA_OECONF = "--disable-curl --disable-soup --disable-ldap \ 14EXTRA_OECONF = "--disable-curl --disable-soup --disable-ldap \
15 --enable-gmp --disable-mysql --disable-sqlite \ 15 --enable-gmp --disable-mysql --disable-sqlite \
16 --enable-openssl" 16 --enable-openssl"
17 17
18EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 18EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
19 19
diff --git a/meta-oe/recipes-support/synergy/synergy_1.3.8.bb b/meta-oe/recipes-support/synergy/synergy_1.3.8.bb
index b8d1e6c158..02a24b7456 100644
--- a/meta-oe/recipes-support/synergy/synergy_1.3.8.bb
+++ b/meta-oe/recipes-support/synergy/synergy_1.3.8.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/${PN}-${PV}-Source"
16inherit cmake 16inherit cmake
17 17
18do_install() { 18do_install() {
19 install -d ${D}/usr/bin 19 install -d ${D}/usr/bin
20 install -m 0755 ${S}/bin/synergy* ${D}/usr/bin/ 20 install -m 0755 ${S}/bin/synergy* ${D}/usr/bin/
21} 21}
22 22
diff --git a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
index 6aa5a9e80b..83bb0c248b 100644
--- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
+++ b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
@@ -7,7 +7,7 @@ inherit autotools pkgconfig
7 7
8SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz \ 8SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz \
9 file://install-swig-interface-in-SWINGLIBDIR.patch \ 9 file://install-swig-interface-in-SWINGLIBDIR.patch \
10 " 10"
11SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b" 11SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b"
12SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4" 12SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4"
13 13
@@ -17,21 +17,21 @@ PR = "r2"
17 17
18# autoreconf doesn't work well while reconfiguring included libreplace 18# autoreconf doesn't work well while reconfiguring included libreplace
19do_configure () { 19do_configure () {
20 gnu-configize 20 gnu-configize
21 oe_runconf 21 oe_runconf
22} 22}
23 23
24do_install_prepend() { 24do_install_prepend() {
25 # Hack the way swig interface for talloc is installed 25 # Hack the way swig interface for talloc is installed
26 # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch 26 # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch
27 type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found" 27 type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found"
28} 28}
29 29
30do_install_append() { 30do_install_append() {
31 install -d ${D}${libdir} 31 install -d ${D}${libdir}
32 ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0 32 ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
33 ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2 33 ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
34 ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so 34 ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
35} 35}
36 36
37PACKAGES += "${PN}-swig" 37PACKAGES += "${PN}-swig"
diff --git a/meta-oe/recipes-support/tbb/tbb_4.1.bb b/meta-oe/recipes-support/tbb/tbb_4.1.bb
index 2337bddaaf..a159321c1f 100644
--- a/meta-oe/recipes-support/tbb/tbb_4.1.bb
+++ b/meta-oe/recipes-support/tbb/tbb_4.1.bb
@@ -1,8 +1,8 @@
1DESCRIPTION = "Parallelism library for C++ - runtime files \ 1DESCRIPTION = "Parallelism library for C++ - runtime files \
2 TBB is a library that helps you leverage multi-core processor \ 2 TBB is a library that helps you leverage multi-core processor \
3 performance without having to be a threading expert. It represents a \ 3 performance without having to be a threading expert. It represents a \
4 higher-level, task-based parallelism that abstracts platform details \ 4 higher-level, task-based parallelism that abstracts platform details \
5 and threading mechanism for performance and scalability." 5 and threading mechanism for performance and scalability."
6HOMEPAGE = "http://threadingbuildingblocks.org/" 6HOMEPAGE = "http://threadingbuildingblocks.org/"
7LICENSE = "GPLv2" 7LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=2c7f2caf277a3933e3acdf7f89d54cc1" 8LIC_FILES_CHKSUM = "file://COPYING;md5=2c7f2caf277a3933e3acdf7f89d54cc1"
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
index d3ca24f3e4..1da819412b 100644
--- a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
+++ b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
@@ -6,11 +6,11 @@ SECTION = "console/network"
6DEPENDS = "libpcap" 6DEPENDS = "libpcap"
7 7
8SRC_URI = " \ 8SRC_URI = " \
9 http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ 9 http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
10 file://tcpdump_configure_no_-O2.patch \ 10 file://tcpdump_configure_no_-O2.patch \
11 file://0001-minimal-IEEE802.15.4-allowed.patch \ 11 file://0001-minimal-IEEE802.15.4-allowed.patch \
12 file://ipv6-cross.patch \ 12 file://ipv6-cross.patch \
13 file://configure.patch \ 13 file://configure.patch \
14" 14"
15SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8" 15SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8"
16SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286" 16SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286"
@@ -19,25 +19,25 @@ inherit autotools
19CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" 19CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}"
20 20
21EXTRA_OECONF = "--without-crypto --disable-rpath \ 21EXTRA_OECONF = "--without-crypto --disable-rpath \
22 ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" 22 ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}"
23 23
24EXTRA_AUTORECONF += " -I m4" 24EXTRA_AUTORECONF += " -I m4"
25 25
26do_configure_prepend() { 26do_configure_prepend() {
27 mkdir -p ${S}/m4 27 mkdir -p ${S}/m4
28 if [ -f aclocal.m4 ]; then 28 if [ -f aclocal.m4 ]; then
29 mv aclocal.m4 ${S}/m4 29 mv aclocal.m4 ${S}/m4
30 fi 30 fi
31 # AC_CHECK_LIB(dlpi.. was looking to host /lib 31 # AC_CHECK_LIB(dlpi.. was looking to host /lib
32 sed -i 's:-L/lib::g' ./configure.in 32 sed -i 's:-L/lib::g' ./configure.in
33} 33}
34do_configure_append() { 34do_configure_append() {
35 sed -i 's:-L/usr/lib::' ./Makefile 35 sed -i 's:-L/usr/lib::' ./Makefile
36 sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile 36 sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile
37 sed -i 's:-I/usr/include::' ./Makefile 37 sed -i 's:-I/usr/include::' ./Makefile
38} 38}
39 39
40do_install_append() { 40do_install_append() {
41 # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 41 # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0
42 rm -f ${D}${sbindir}/tcpdump.${PV} 42 rm -f ${D}${sbindir}/tcpdump.${PV}
43} 43}
diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
index baaac2999d..5c5fab9487 100644
--- a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
+++ b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
@@ -14,14 +14,14 @@ S = "${WORKDIR}/git"
14inherit gitpkgv pkgconfig 14inherit gitpkgv pkgconfig
15 15
16do_compile() { 16do_compile() {
17 oe_runmake \ 17 oe_runmake \
18 CC="${CC}" \ 18 CC="${CC}" \
19 CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \ 19 CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \
20 LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}" 20 LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}"
21} 21}
22 22
23do_install() { 23do_install() {
24 oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install 24 oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install
25} 25}
26 26
27RDEPENDS_${PN}_append_libc-glibc += "glibc-gconv-ibm437" 27RDEPENDS_${PN}_append_libc-glibc += "glibc-gconv-ibm437"
diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb
index 5a33ab92d5..902a9839ac 100644
--- a/meta-oe/recipes-support/upower/upower_0.9.14.bb
+++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb
@@ -15,16 +15,16 @@ inherit autotools pkgconfig gettext
15EXTRA_OECONF = " --with-backend=linux" 15EXTRA_OECONF = " --with-backend=linux"
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am 18 sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
19 sed -i -e 's: doc : :g' ${S}/Makefile.am 19 sed -i -e 's: doc : :g' ${S}/Makefile.am
20} 20}
21 21
22 22
23RRECOMMENDS_${PN} += "pm-utils" 23RRECOMMENDS_${PN} += "pm-utils"
24FILES_${PN} += "${datadir}/dbus-1/ \ 24FILES_${PN} += "${datadir}/dbus-1/ \
25 ${datadir}/polkit-1/ \ 25 ${datadir}/polkit-1/ \
26 ${base_libdir}/udev/* \ 26 ${base_libdir}/udev/* \
27 " 27"
28 28
29FILES_${PN}-dbg += "${base_libdir}/udev/.debug" 29FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
30 30
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb
index 8a6fc134d7..de8181245e 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb
@@ -9,7 +9,7 @@ SRC_URI[md5sum] = "a7d23a03157871013a0d708ab2b1b6df"
9SRC_URI[sha256sum] = "a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5" 9SRC_URI[sha256sum] = "a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5"
10 10
11do_install() { 11do_install() {
12 oe_runmake install DESTDIR=${D} 12 oe_runmake install DESTDIR=${D}
13} 13}
14 14
15RDEPENDS_${PN} = "usb-modeswitch" 15RDEPENDS_${PN} = "usb-modeswitch"
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
index b0c9e951d7..fe6ea62903 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
@@ -11,8 +11,8 @@ SRC_URI[md5sum] = "c393603908eceab95444c5bde790f6f0"
11SRC_URI[sha256sum] = "ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f" 11SRC_URI[sha256sum] = "ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f"
12 12
13do_install() { 13do_install() {
14 sed 's_!/usr/bin_!'"${bindir}"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher 14 sed 's_!/usr/bin_!'"${bindir}"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher
15 oe_runmake install DESTDIR=${D} 15 oe_runmake install DESTDIR=${D}
16} 16}
17 17
18FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" 18FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc
index 4fa8f7cad7..e288fff287 100644
--- a/meta-oe/recipes-support/vim/vim.inc
+++ b/meta-oe/recipes-support/vim/vim.inc
@@ -12,10 +12,10 @@ VIMDIR = "${PN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[
12INC_PR = "r13" 12INC_PR = "r13"
13 13
14SRC_URI = " \ 14SRC_URI = " \
15 ftp://ftp.${PN}.org/pub/${PN}/unix/${PN}-${PV_MAJOR}.tar.bz2;name=${VIMDIR} \ 15 ftp://ftp.${PN}.org/pub/${PN}/unix/${PN}-${PV_MAJOR}.tar.bz2;name=${VIMDIR} \
16 ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-extra.tar.gz;name=${VIMDIR}-extra \ 16 ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-extra.tar.gz;name=${VIMDIR}-extra \
17 ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-lang.tar.gz;name=${VIMDIR}-lang \ 17 ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-lang.tar.gz;name=${VIMDIR}-lang \
18 file://vimrc \ 18 file://vimrc \
19" 19"
20 20
21S = "${WORKDIR}/${VIMDIR}/src" 21S = "${WORKDIR}/${VIMDIR}/src"
@@ -24,13 +24,13 @@ inherit autotools update-alternatives
24 24
25# vim configure.in contains functions which got 'dropped' by autotools.bbclass 25# vim configure.in contains functions which got 'dropped' by autotools.bbclass
26do_configure () { 26do_configure () {
27 rm -f auto/* 27 rm -f auto/*
28 touch auto/config.mk 28 touch auto/config.mk
29 aclocal 29 aclocal
30 autoconf 30 autoconf
31 oe_runconf 31 oe_runconf
32 touch auto/configure 32 touch auto/configure
33 touch auto/config.mk auto/config.h 33 touch auto/config.mk auto/config.h
34} 34}
35 35
36#Available PACKAGECONFIG options are gtkgui, x11, tiny 36#Available PACKAGECONFIG options are gtkgui, x11, tiny
@@ -41,25 +41,25 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,xt,"
41PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," 41PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,,"
42 42
43EXTRA_OECONF = " \ 43EXTRA_OECONF = " \
44 --disable-gpm \ 44 --disable-gpm \
45 --disable-gtktest \ 45 --disable-gtktest \
46 --disable-xim \ 46 --disable-xim \
47 --disable-netbeans \ 47 --disable-netbeans \
48 --with-tlib=ncurses \ 48 --with-tlib=ncurses \
49 ac_cv_small_wchar_t=no \ 49 ac_cv_small_wchar_t=no \
50 vim_cv_getcwd_broken=no \ 50 vim_cv_getcwd_broken=no \
51 vim_cv_memmove_handles_overlap=yes \ 51 vim_cv_memmove_handles_overlap=yes \
52 vim_cv_stat_ignores_slash=no \ 52 vim_cv_stat_ignores_slash=no \
53 vim_cv_terminfo=yes \ 53 vim_cv_terminfo=yes \
54 vim_cv_tgent=non-zero \ 54 vim_cv_tgent=non-zero \
55 vim_cv_toupper_broken=no \ 55 vim_cv_toupper_broken=no \
56 vim_cv_tty_group=world \ 56 vim_cv_tty_group=world \
57" 57"
58 58
59# Work around rpm picking up csh as a dep 59# Work around rpm picking up csh as a dep
60do_install_append() { 60do_install_append() {
61 chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132 61 chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132
62 install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/${PN} 62 install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/${PN}
63} 63}
64 64
65PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" 65PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
index 6d1fa9a7fd..6c9037bb2b 100644
--- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
+++ b/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig"
12TARGET_CC_ARCH += "${LDFLAGS}" 12TARGET_CC_ARCH += "${LDFLAGS}"
13 13
14do_install() { 14do_install() {
15 install -d ${D}${bindir} 15 install -d ${D}${bindir}
16 install -m 0755 wmiconfig ${D}${bindir} 16 install -m 0755 wmiconfig ${D}${bindir}
17} 17}
18 18
diff --git a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
index 70dc150d7e..d0a868e813 100644
--- a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
+++ b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb
@@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
9PR = "r1" 9PR = "r1"
10 10
11SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \ 11SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
12 file://glib-2.32.patch \ 12 file://glib-2.32.patch \
13" 13"
14 14
15inherit autotools gettext 15inherit autotools gettext
16 16
17EXTRA_OECONF = "\ 17EXTRA_OECONF = "\
18 --disable-perl \ 18 --disable-perl \
19 --disable-python \ 19 --disable-python \
20 --disable-tcl \ 20 --disable-tcl \
21" 21"
22do_configure_prepend(){ 22do_configure_prepend(){
23 rm -f ${S}/po/Makefile.in.in 23 rm -f ${S}/po/Makefile.in.in
diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb b/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb
index ef5224b5f0..ba3490d1c3 100644
--- a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb
+++ b/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb
@@ -8,8 +8,8 @@ DEPENDS = "util-linux"
8PR = "r1" 8PR = "r1"
9 9
10SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \ 10SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \
11 file://remove-install-as-user.patch \ 11 file://remove-install-as-user.patch \
12 file://drop-configure-check-for-aio.patch \ 12 file://drop-configure-check-for-aio.patch \
13" 13"
14 14
15SRC_URI[md5sum] = "f70b2e7200d4c29f0af1cf70e7be1db6" 15SRC_URI[md5sum] = "f70b2e7200d4c29f0af1cf70e7be1db6"
@@ -27,16 +27,16 @@ FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}"
27 27
28EXTRA_OECONF = "--enable-gettext=no" 28EXTRA_OECONF = "--enable-gettext=no"
29do_configure () { 29do_configure () {
30 # Prevent Makefile from calling configure without arguments, 30 # Prevent Makefile from calling configure without arguments,
31 # when do_configure gets called for a second time. 31 # when do_configure gets called for a second time.
32 rm -f include/builddefs include/platform_defs.h 32 rm -f include/builddefs include/platform_defs.h
33 # Recreate configure script. 33 # Recreate configure script.
34 rm -f configure 34 rm -f configure
35 oe_runmake configure 35 oe_runmake configure
36 # Configure. 36 # Configure.
37 export DEBUG="-DNDEBUG" 37 export DEBUG="-DNDEBUG"
38 gnu-configize --force 38 gnu-configize --force
39 oe_runconf 39 oe_runconf
40} 40}
41 41
42LIBTOOL = "${HOST_SYS}-libtool" 42LIBTOOL = "${HOST_SYS}-libtool"
@@ -45,13 +45,13 @@ TARGET_CC_ARCH += "${LDFLAGS}"
45PARALLEL_MAKE = "" 45PARALLEL_MAKE = ""
46 46
47do_install () { 47do_install () {
48 export DIST_ROOT=${D} 48 export DIST_ROOT=${D}
49 oe_runmake install 49 oe_runmake install
50 # needed for xfsdump 50 # needed for xfsdump
51 oe_runmake install-dev 51 oe_runmake install-dev
52 rm ${D}${base_libdir}/libhandle.a 52 rm ${D}${base_libdir}/libhandle.a
53 rm ${D}${base_libdir}/libhandle.la 53 rm ${D}${base_libdir}/libhandle.la
54 rm ${D}${base_libdir}/libhandle.so 54 rm ${D}${base_libdir}/libhandle.so
55 rm ${D}${libdir}/libhandle.so 55 rm ${D}${libdir}/libhandle.so
56 ln -s ../..${base_libdir}/libhandle.so.1 ${D}${libdir}/libhandle.so 56 ln -s ../..${base_libdir}/libhandle.so.1 ${D}${libdir}/libhandle.so
57} 57}