diff options
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/emacs/emacs.inc | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/benchfft_3.1.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/fftw/fftw.inc | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/lcov/lcov_1.11.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv-samples_2.4.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap_2.4.43.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/spitools/spitools_git.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/upower/upower_0.99.4.bb | 2 |
15 files changed, 17 insertions, 17 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 35c891e7a..3ef179295 100644 --- a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb +++ b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb | |||
@@ -22,7 +22,7 @@ do_configure() { | |||
22 | cp -R --no-dereference --preserve=mode,links -v ${S}/autoconf/configure.in ${S} | 22 | cp -R --no-dereference --preserve=mode,links -v ${S}/autoconf/configure.in ${S} |
23 | 23 | ||
24 | if ! [ -d ${S}/platforms/${DISTRO} ] ; then | 24 | if ! [ -d ${S}/platforms/${DISTRO} ] ; then |
25 | cp -R --no-dereference --preserve=mode,links -v ${S}/platforms/unknown ${S}/platforms/${DISTRO} | 25 | cp -R --no-dereference --preserve=mode,links -v ${S}/platforms/unknown ${S}/platforms/${DISTRO} |
26 | fi | 26 | fi |
27 | 27 | ||
28 | gnu-configize --force | 28 | gnu-configize --force |
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc index ffb5c50c7..012895e85 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc | |||
@@ -14,7 +14,7 @@ X11DEPENDS = " \ | |||
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 | ||
19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " | 19 | EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " |
20 | 20 | ||
@@ -55,7 +55,7 @@ do_compile_prepend() { | |||
55 | if [ -e $treedir ];then | 55 | if [ -e $treedir ];then |
56 | rm -rf $treedir | 56 | rm -rf $treedir |
57 | fi | 57 | fi |
58 | 58 | ||
59 | mkdir -p $treedir/${base_libdir} | 59 | mkdir -p $treedir/${base_libdir} |
60 | 60 | ||
61 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then | 61 | if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then |
diff --git a/meta-oe/recipes-support/fftw/benchfft_3.1.bb b/meta-oe/recipes-support/fftw/benchfft_3.1.bb index d859386be..3e06a5a4b 100644 --- a/meta-oe/recipes-support/fftw/benchfft_3.1.bb +++ b/meta-oe/recipes-support/fftw/benchfft_3.1.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "FFTW benchmarks" | |||
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | 4 | ||
5 | # single precision fftw is called fftwf | 5 | # single precision fftw is called fftwf |
6 | DEPENDS = "virtual/fftw" | 6 | DEPENDS = "virtual/fftw" |
7 | 7 | ||
8 | SRC_URI = "http://www.fftw.org/benchfft/benchfft-${PV}.tar.gz" | 8 | SRC_URI = "http://www.fftw.org/benchfft/benchfft-${PV}.tar.gz" |
diff --git a/meta-oe/recipes-support/fftw/fftw.inc b/meta-oe/recipes-support/fftw/fftw.inc index 1522ea0bb..a0adf59be 100644 --- a/meta-oe/recipes-support/fftw/fftw.inc +++ b/meta-oe/recipes-support/fftw/fftw.inc | |||
@@ -16,7 +16,7 @@ inherit autotools pkgconfig | |||
16 | EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" | 16 | EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" |
17 | 17 | ||
18 | do_configure_prepend() { | 18 | do_configure_prepend() { |
19 | echo 'AM_PROG_AS' >> ${S}/configure.ac | 19 | echo 'AM_PROG_AS' >> ${S}/configure.ac |
20 | } | 20 | } |
21 | 21 | ||
22 | PACKAGES =+ "lib${BPN}" | 22 | PACKAGES =+ "lib${BPN}" |
diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb b/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb index a4273fbd5..9e74df5a0 100644 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb +++ b/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb | |||
@@ -31,7 +31,7 @@ PACKAGECONFIG[systemd] = "--enable-systemd=${datadir}/${BPN}, --enable-systemd=n | |||
31 | PACKAGECONFIG[sha256] = "--enable-sha256, --enable-sha256=no, openssl-native, openssl" | 31 | PACKAGECONFIG[sha256] = "--enable-sha256, --enable-sha256=no, openssl-native, openssl" |
32 | PACKAGECONFIG[lanplus] = "--enable-lanplus, --enable-lanplus=no, openssl-native, openssl" | 32 | PACKAGECONFIG[lanplus] = "--enable-lanplus, --enable-lanplus=no, openssl-native, openssl" |
33 | PACKAGECONFIG[landesk] = "--enable-landesk, --enable-landesk=no" | 33 | PACKAGECONFIG[landesk] = "--enable-landesk, --enable-landesk=no" |
34 | PACKAGECONFIG[sensors] = "--enable-libsensors, --enable-libsensors=no" | 34 | PACKAGECONFIG[sensors] = "--enable-libsensors, --enable-libsensors=no" |
35 | 35 | ||
36 | #build with some GPL code | 36 | #build with some GPL code |
37 | PACKAGECONFIG[gpl] = "--enable-gpl, --enable-gpl=no" | 37 | PACKAGECONFIG[gpl] = "--enable-gpl, --enable-gpl=no" |
diff --git a/meta-oe/recipes-support/lcov/lcov_1.11.bb b/meta-oe/recipes-support/lcov/lcov_1.11.bb index 5f3b88934..114bd84cd 100644 --- a/meta-oe/recipes-support/lcov/lcov_1.11.bb +++ b/meta-oe/recipes-support/lcov/lcov_1.11.bb | |||
@@ -4,7 +4,7 @@ DESCRIPTION = "LCOV is a graphical front-end for GCC's coverage testing \ | |||
4 | tool gcov. It collects gcov data for multiple source files and creates \ | 4 | tool gcov. It collects gcov data for multiple source files and creates \ |
5 | HTML pages containing the source code annotated with coverage information. \ | 5 | HTML pages containing the source code annotated with coverage information. \ |
6 | It also adds overview pages for easy navigation within the file structure. \ | 6 | It also adds overview pages for easy navigation within the file structure. \ |
7 | LCOV supports statement, function and branch coverage measurement." | 7 | LCOV supports statement, function and branch coverage measurement." |
8 | LICENSE = "GPL-2.0" | 8 | LICENSE = "GPL-2.0" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
10 | 10 | ||
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb index e09a5393d..4460be207 100644 --- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb +++ b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | # (c) Copyright 2012 Hewlett-Packard Development Company, L.P. | 1 | # (c) Copyright 2012 Hewlett-Packard Development Company, L.P. |
2 | 2 | ||
3 | SUMMARY = "a simple, small, minimal, C++ XML parser" | 3 | SUMMARY = "a simple, small, minimal, C++ XML parser" |
4 | HOMEPAGE = "http://www.sourceforge.net/projects/tinyxml" | 4 | HOMEPAGE = "http://www.sourceforge.net/projects/tinyxml" |
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb index 3638019c4..b0091d657 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb | |||
@@ -48,7 +48,7 @@ PACKAGES =+ "${PN}-fancontrol" | |||
48 | PACKAGES =+ "${PN}-cgi" | 48 | PACKAGES =+ "${PN}-cgi" |
49 | RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi" | 49 | RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi" |
50 | RDEPENDS_${PN}-cgi = "${PN}-sensord rrdtool" | 50 | RDEPENDS_${PN}-cgi = "${PN}-sensord rrdtool" |
51 | FILES_${PN}-cgi = "/www/*" | 51 | FILES_${PN}-cgi = "/www/*" |
52 | 52 | ||
53 | # libsensors configuration file | 53 | # libsensors configuration file |
54 | FILES_${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf" | 54 | FILES_${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf" |
diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb index ecaae4c08..b8e3a2d20 100644 --- a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb | |||
@@ -35,7 +35,7 @@ do_install() { | |||
35 | done | 35 | done |
36 | } | 36 | } |
37 | 37 | ||
38 | FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" | 38 | FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" |
39 | FILES_${PN} += "${bindir} ${datadir}/opencv" | 39 | FILES_${PN} += "${bindir} ${datadir}/opencv" |
40 | 40 | ||
41 | PNBLACKLIST[opencv-samples] ?= "Depends on blacklisted opencv" | 41 | PNBLACKLIST[opencv-samples] ?= "Depends on blacklisted opencv" |
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index 83e7de8c0..ced066f56 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb | |||
@@ -69,7 +69,7 @@ python populate_packages_prepend () { | |||
69 | metapkg = pn + '-dev' | 69 | metapkg = pn + '-dev' |
70 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | 70 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") |
71 | blacklist = [ metapkg ] | 71 | blacklist = [ metapkg ] |
72 | metapkg_rdepends = [ ] | 72 | metapkg_rdepends = [ ] |
73 | packages = d.getVar('PACKAGES', 1).split() | 73 | packages = d.getVar('PACKAGES', 1).split() |
74 | for pkg in packages[1:]: | 74 | for pkg in packages[1:]: |
75 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): | 75 | if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): |
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb index 861836562..284db657c 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb | |||
@@ -71,7 +71,7 @@ EXTRA_OECONF += "--enable-crypt" | |||
71 | # SLAPD BACKEND | 71 | # SLAPD BACKEND |
72 | # | 72 | # |
73 | # The backend must be set by the configuration. This controls the | 73 | # The backend must be set by the configuration. This controls the |
74 | # required database. | 74 | # required database. |
75 | # | 75 | # |
76 | # Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" | 76 | # Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" |
77 | # | 77 | # |
diff --git a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb index 93cbdd7e3..f5896e6e1 100644 --- a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb +++ b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb | |||
@@ -61,7 +61,7 @@ do_install() { | |||
61 | install -d ${D}/etc/openwbem/openwbem.conf.d | 61 | install -d ${D}/etc/openwbem/openwbem.conf.d |
62 | install -d ${D}/var/adm/fillup-templates | 62 | install -d ${D}/var/adm/fillup-templates |
63 | install -m 644 etc/sysconfig/daemons/owcimomd ${D}/var/adm/fillup-templates/sysconfig.owcimomd | 63 | install -m 644 etc/sysconfig/daemons/owcimomd ${D}/var/adm/fillup-templates/sysconfig.owcimomd |
64 | 64 | ||
65 | # fix up hardcoded paths | 65 | # fix up hardcoded paths |
66 | sed -i -e 's,/usr/sbin/,${sbindir}/,' ${WORKDIR}/owcimomd.service | 66 | sed -i -e 's,/usr/sbin/,${sbindir}/,' ${WORKDIR}/owcimomd.service |
67 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 67 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb b/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb index d8b64b7c0..e9971467f 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb | |||
@@ -71,8 +71,8 @@ FILES_libpurple-dev = "${libdir}/libpurple*.la \ | |||
71 | ${datadir}/aclocal" | 71 | ${datadir}/aclocal" |
72 | FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ | 72 | FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ |
73 | ${libdir}/purple-2/.debug" | 73 | ${libdir}/purple-2/.debug" |
74 | FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" | 74 | FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" |
75 | FILES_libgnt-dev = "${libdir}/gnt/*.la" | 75 | FILES_libgnt-dev = "${libdir}/gnt/*.la" |
76 | FILES_libgnt-dbg = "${libdir}/gnt/.debug" | 76 | FILES_libgnt-dbg = "${libdir}/gnt/.debug" |
77 | FILES_finch = "${bindir}/finch" | 77 | FILES_finch = "${bindir}/finch" |
78 | FILES_finch-dev = "${libdir}/finch/*.la" | 78 | FILES_finch-dev = "${libdir}/finch/*.la" |
diff --git a/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-oe/recipes-support/spitools/spitools_git.bb index a308e42c6..f8081256a 100644 --- a/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-oe/recipes-support/spitools/spitools_git.bb | |||
@@ -9,6 +9,6 @@ S = "${WORKDIR}/git" | |||
9 | SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" | 9 | SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" |
10 | 10 | ||
11 | SRCREV = "03405ab45884e4264dfa0371c032b2baaeeaaa98" | 11 | SRCREV = "03405ab45884e4264dfa0371c032b2baaeeaaa98" |
12 | 12 | ||
13 | inherit autotools | 13 | inherit autotools |
14 | 14 | ||
diff --git a/meta-oe/recipes-support/upower/upower_0.99.4.bb b/meta-oe/recipes-support/upower/upower_0.99.4.bb index 861f17ccf..770f33360 100644 --- a/meta-oe/recipes-support/upower/upower_0.99.4.bb +++ b/meta-oe/recipes-support/upower/upower_0.99.4.bb | |||
@@ -18,7 +18,7 @@ EXTRA_OECONF = " --with-backend=linux" | |||
18 | do_configure_prepend() { | 18 | do_configure_prepend() { |
19 | sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am | 19 | sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am |
20 | sed -i -e 's: doc : :g' ${S}/Makefile.am | 20 | sed -i -e 's: doc : :g' ${S}/Makefile.am |
21 | } | 21 | } |
22 | 22 | ||
23 | RDEPENDS_${PN} += "dbus" | 23 | RDEPENDS_${PN} += "dbus" |
24 | RRECOMMENDS_${PN} += "pm-utils" | 24 | RRECOMMENDS_${PN} += "pm-utils" |