summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-08-18 18:53:48 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-22 15:56:28 +0200
commit289217bbc3c5c53f486ab5615a6d6196e3c12cf2 (patch)
treef9551306e700a0ba0218177f3ec417f76d1f5759 /meta-oe/recipes-support
parentf2bec07b87b3f1118aa1d1f194d230920f1afe01 (diff)
downloadmeta-openembedded-289217bbc3c5c53f486ab5615a6d6196e3c12cf2.tar.gz
meta-oe: fix indentation
* remove tabs which sneaked in since last cleanup * meta-oe layers are using consistent indentation with 4 spaces, see http://www.openembedded.org/wiki/Styleguide Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/anthy/anthy_9100h.bb25
-rw-r--r--meta-oe/recipes-support/augeas/augeas.inc2
-rw-r--r--meta-oe/recipes-support/ccid/ccid_1.4.24.bb3
-rw-r--r--meta-oe/recipes-support/fbtest/fb-test_git.bb12
-rw-r--r--meta-oe/recipes-support/gd/gd_2.2.3.bb4
-rw-r--r--meta-oe/recipes-support/htop/htop_1.0.3.bb2
-rw-r--r--meta-oe/recipes-support/libee/libee.inc10
-rw-r--r--meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb2
-rw-r--r--meta-oe/recipes-support/mysql/mariadb.inc4
-rw-r--r--meta-oe/recipes-support/numactl/numactl_2.0.11.bb56
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.1.bb37
-rw-r--r--meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb11
-rw-r--r--meta-oe/recipes-support/sharutils/sharutils_4.14.bb6
-rw-r--r--meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb4
-rw-r--r--meta-oe/recipes-support/uim/uim_1.8.6.bb108
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb2
16 files changed, 148 insertions, 140 deletions
diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb
index e121b447d3..a65d324eae 100644
--- a/meta-oe/recipes-support/anthy/anthy_9100h.bb
+++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb
@@ -6,9 +6,9 @@ LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a" 6LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a"
7 7
8SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ 8SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \
9 file://not_build_elc.patch \ 9 file://not_build_elc.patch \
10 file://2ch_t.patch \ 10 file://2ch_t.patch \
11 " 11"
12 12
13SRC_URI_append_class-target = "file://target-helpers.patch" 13SRC_URI_append_class-target = "file://target-helpers.patch"
14SRC_URI_append_class-native = "file://native-helpers.patch" 14SRC_URI_append_class-native = "file://native-helpers.patch"
@@ -25,18 +25,21 @@ PACKAGES += "${PN}-el libanthy0 libanthy-dev"
25 25
26FILES_${PN}-dbg += "${libdir}/.debug" 26FILES_${PN}-dbg += "${libdir}/.debug"
27FILES_libanthy0 = "${libdir}/libanthy.so.* \ 27FILES_libanthy0 = "${libdir}/libanthy.so.* \
28 ${libdir}/libanthydic.so.* \ 28 ${libdir}/libanthydic.so.* \
29 ${libdir}/libanthyinput.so.*" 29 ${libdir}/libanthyinput.so.* \
30"
30 31
31FILES_libanthy-dev = "${libdir}/libanthy*.la \ 32FILES_libanthy-dev = "${libdir}/libanthy*.la \
32 ${libdir}/libanthy*.a \ 33 ${libdir}/libanthy*.a \
33 ${libdir}/libanthy*.so \ 34 ${libdir}/libanthy*.so \
34 ${includedir}/anthy \ 35 ${includedir}/anthy \
35 ${libdir}/pkgconfig/anthy.pc" 36 ${libdir}/pkgconfig/anthy.pc \
37"
36 38
37FILES_${PN}-el = "${datadir}/emacs/*" 39FILES_${PN}-el = "${datadir}/emacs/*"
38FILES_${PN} = "${datadir}/* \ 40FILES_${PN} = "${datadir}/* \
39 ${bindir}/* \ 41 ${bindir}/* \
40 ${sysconfdir}/anthy-conf" 42 ${sysconfdir}/anthy-conf \
43"
41 44
42BBCLASSEXTEND = "native" 45BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/augeas/augeas.inc b/meta-oe/recipes-support/augeas/augeas.inc
index 23d12cadfe..354b1809f0 100644
--- a/meta-oe/recipes-support/augeas/augeas.inc
+++ b/meta-oe/recipes-support/augeas/augeas.inc
@@ -26,5 +26,5 @@ RRECOMMENDS_lib${BPN} += "${PN}"
26LEAD_SONAME = "libaugeas.so" 26LEAD_SONAME = "libaugeas.so"
27 27
28do_install_append() { 28do_install_append() {
29 rm -fr ${D}${datadir}/vim 29 rm -fr ${D}${datadir}/vim
30} 30}
diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.24.bb b/meta-oe/recipes-support/ccid/ccid_1.4.24.bb
index 49f7a0c8b7..31145d0efd 100644
--- a/meta-oe/recipes-support/ccid/ccid_1.4.24.bb
+++ b/meta-oe/recipes-support/ccid/ccid_1.4.24.bb
@@ -7,7 +7,8 @@ DEPENDS = "virtual/libusb0 pcsc-lite"
7RDEPENDS_${PN} = "pcsc-lite" 7RDEPENDS_${PN} = "pcsc-lite"
8 8
9SRC_URI = "https://alioth.debian.org/frs/download.php/file/4171/ccid-${PV}.tar.bz2 \ 9SRC_URI = "https://alioth.debian.org/frs/download.php/file/4171/ccid-${PV}.tar.bz2 \
10 file://no-dep-on-libfl.patch " 10 file://no-dep-on-libfl.patch \
11"
11 12
12SRC_URI[md5sum] = "915a03cda85b60fefbe3654cbdc68ca9" 13SRC_URI[md5sum] = "915a03cda85b60fefbe3654cbdc68ca9"
13SRC_URI[sha256sum] = "62cb73c6c009c9799c526f05a05e25f00f0ad86d50f82a714dedcfbf4a7e4176" 14SRC_URI[sha256sum] = "62cb73c6c009c9799c526f05a05e25f00f0ad86d50f82a714dedcfbf4a7e4176"
diff --git a/meta-oe/recipes-support/fbtest/fb-test_git.bb b/meta-oe/recipes-support/fbtest/fb-test_git.bb
index 13f9e377a8..6a9d4b2787 100644
--- a/meta-oe/recipes-support/fbtest/fb-test_git.bb
+++ b/meta-oe/recipes-support/fbtest/fb-test_git.bb
@@ -11,10 +11,10 @@ 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 install -m 0755 fb-test ${D}${bindir} 15 install -m 0755 fb-test ${D}${bindir}
16 # avoid collisions with perf (perf) and mesa-demos (offset) 16 # avoid collisions with perf (perf) and mesa-demos (offset)
17 for prog in perf rect offset ; do 17 for prog in perf rect offset ; do
18 install -m 0755 $prog ${D}${bindir}/fb-$prog 18 install -m 0755 $prog ${D}${bindir}/fb-$prog
19 done 19 done
20} 20}
diff --git a/meta-oe/recipes-support/gd/gd_2.2.3.bb b/meta-oe/recipes-support/gd/gd_2.2.3.bb
index 80d66c9f7d..c5aff66167 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.3.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.3.bb
@@ -33,8 +33,8 @@ EXTRA_OECONF += " --disable-rpath \
33EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' 33EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
34 34
35do_install_append() { 35do_install_append() {
36 # cleanup buildpaths from gdlib.pc 36 # cleanup buildpaths from gdlib.pc
37 sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc 37 sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc
38} 38}
39 39
40PACKAGES += "${PN}-tools" 40PACKAGES += "${PN}-tools"
diff --git a/meta-oe/recipes-support/htop/htop_1.0.3.bb b/meta-oe/recipes-support/htop/htop_1.0.3.bb
index 4e445c8b35..181661af72 100644
--- a/meta-oe/recipes-support/htop/htop_1.0.3.bb
+++ b/meta-oe/recipes-support/htop/htop_1.0.3.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f5
16LDFLAGS_append_libc-uclibc = " -lubacktrace" 16LDFLAGS_append_libc-uclibc = " -lubacktrace"
17 17
18do_configure_prepend () { 18do_configure_prepend () {
19 rm -rf ${S}/config.h 19 rm -rf ${S}/config.h
20} 20}
21 21
22inherit autotools 22inherit autotools
diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc
index 256fa053be..e5a145ab22 100644
--- a/meta-oe/recipes-support/libee/libee.inc
+++ b/meta-oe/recipes-support/libee/libee.inc
@@ -28,12 +28,12 @@ TESTDIR = "tests"
28# We presume the tests we are going to install so just build them directly. 28# We presume the tests we are going to install so just build them directly.
29# 29#
30do_compile_ptest() { 30do_compile_ptest() {
31 oe_runmake -C ${TESTDIR} genfile ezapi1 31 oe_runmake -C ${TESTDIR} genfile ezapi1
32} 32}
33 33
34do_install_ptest() { 34do_install_ptest() {
35 install -d ${D}${PTEST_PATH} 35 install -d ${D}${PTEST_PATH}
36 install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} 36 install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH}
37 install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} 37 install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH}
38 install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH} 38 install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH}
39} 39}
diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb
index cf39278a60..9c1a5200b5 100644
--- a/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb
+++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.1.bb
@@ -24,7 +24,7 @@ PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},,"
24PACKAGECONFIG[python] = "--enable-python=${PYTHON_PN},,${PYTHON_PN}" 24PACKAGECONFIG[python] = "--enable-python=${PYTHON_PN},,${PYTHON_PN}"
25 25
26PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ 26PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \
27 '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" 27 '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}"
28 28
29RDEPENDS_${PN} = "libgcc" 29RDEPENDS_${PN} = "libgcc"
30 30
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index 9c3d2340fd..73905b6c06 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -139,8 +139,8 @@ do_install() {
139 ${D}${systemd_unitdir}/system/install_db.service 139 ${D}${systemd_unitdir}/system/install_db.service
140 140
141 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 141 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
142 install -d ${D}${sysconfdir}/tmpfiles.d 142 install -d ${D}${sysconfdir}/tmpfiles.d
143 echo "f /var/log/mysqld.err 0640 mysql mysql -" \ 143 echo "f /var/log/mysqld.err 0640 mysql mysql -" \
144 > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf 144 > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf
145 fi 145 fi
146 install -d ${D}${bindir} 146 install -d ${D}${bindir}
diff --git a/meta-oe/recipes-support/numactl/numactl_2.0.11.bb b/meta-oe/recipes-support/numactl/numactl_2.0.11.bb
index 199726fd08..dd159a3b10 100644
--- a/meta-oe/recipes-support/numactl/numactl_2.0.11.bb
+++ b/meta-oe/recipes-support/numactl/numactl_2.0.11.bb
@@ -11,12 +11,12 @@ inherit autotools-brokensep ptest
11LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9" 11LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9"
12 12
13SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \ 13SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \
14 file://fix-null-pointer.patch \ 14 file://fix-null-pointer.patch \
15 file://Fix-the-test-output-format.patch \ 15 file://Fix-the-test-output-format.patch \
16 file://Makefile \ 16 file://Makefile \
17 file://run-ptest \ 17 file://run-ptest \
18 file://0001-define-run-test-target.patch \ 18 file://0001-define-run-test-target.patch \
19 " 19"
20SRC_URI[md5sum] = "d3bc88b7ddb9f06d60898f4816ae9127" 20SRC_URI[md5sum] = "d3bc88b7ddb9f06d60898f4816ae9127"
21SRC_URI[sha256sum] = "450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861" 21SRC_URI[sha256sum] = "450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861"
22 22
@@ -24,34 +24,34 @@ SRC_URI[sha256sum] = "450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e
24COMPATIBLE_HOST = "^((?!arm).*)$" 24COMPATIBLE_HOST = "^((?!arm).*)$"
25 25
26do_install() { 26do_install() {
27 oe_runmake DESTDIR=${D} prefix=${D}/usr install 27 oe_runmake DESTDIR=${D} prefix=${D}/usr install
28 #remove the empty man2 directory 28 #remove the empty man2 directory
29 rm -r ${D}${mandir}/man2 29 rm -r ${D}${mandir}/man2
30} 30}
31 31
32do_compile_ptest() { 32do_compile_ptest() {
33 oe_runmake test 33 oe_runmake test
34} 34}
35 35
36do_install_ptest() { 36do_install_ptest() {
37 #install tests binaries 37 #install tests binaries
38 local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ 38 local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \
39 mynode nodemap node-parse pagesize prefered randmap realloc_test \ 39 mynode nodemap node-parse pagesize prefered randmap realloc_test \
40 tbitmap tshared" 40 tbitmap tshared"
41 41
42 [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test 42 [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test
43 for i in $test_binaries; do 43 for i in $test_binaries; do
44 install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test 44 install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test
45 done 45 done
46 46
47 local test_scripts="checktopology checkaffinity printcpu regress regress2 \ 47 local test_scripts="checktopology checkaffinity printcpu regress regress2 \
48 shmtest runltp bind_range" 48 shmtest runltp bind_range"
49 for i in $test_scripts; do 49 for i in $test_scripts; do
50 install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test 50 install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test
51 done 51 done
52 52
53 install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ 53 install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/
54 install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ 54 install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/
55} 55}
56 56
57RDEPENDS_${PN}-ptest = "bash" 57RDEPENDS_${PN}-ptest = "bash"
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 8ab9a2b4e0..da1131616b 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -19,11 +19,12 @@ IPP_MD5 = "808b791a6eac9ed78d32a7666804320e"
19 19
20SRCREV_FORMAT = "opencv" 20SRCREV_FORMAT = "opencv"
21SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \ 21SRC_URI = "git://github.com/Itseez/opencv.git;name=opencv \
22 git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \ 22 git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib \
23 git://github.com/Itseez/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \ 23 git://github.com/Itseez/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \
24 file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ 24 file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
25 file://fixgcc60.patch \ 25 file://fixgcc60.patch \
26 file://fixpkgconfig.patch" 26 file://fixpkgconfig.patch \
27"
27 28
28PV = "3.1+git${SRCPV}" 29PV = "3.1+git${SRCPV}"
29 30
@@ -35,22 +36,22 @@ do_unpack_extra() {
35addtask unpack_extra after do_unpack before do_patch 36addtask unpack_extra after do_unpack before do_patch
36 37
37EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ 38EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \
38 -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ 39 -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
39 -DWITH_1394=OFF \ 40 -DWITH_1394=OFF \
40 -DCMAKE_SKIP_RPATH=ON \ 41 -DCMAKE_SKIP_RPATH=ON \
41 -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \ 42 -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \
42 -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \ 43 -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \
43 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ 44 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
44 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ 45 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
45 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ 46 ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
46 ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ 47 ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
47 ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ 48 ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
48" 49"
49EXTRA_OECMAKE_append_x86 = " -DX86=ON" 50EXTRA_OECMAKE_append_x86 = " -DX86=ON"
50 51
51PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ 52PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
52 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ 53 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
53 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" 54 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
54 55
55PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," 56PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
56PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," 57PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
@@ -80,7 +81,7 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/"
80TARGET_CC_ARCH += "-I${S}/include " 81TARGET_CC_ARCH += "-I${S}/include "
81 82
82PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \ 83PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \
83 ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" 84 ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv"
84 85
85python populate_packages_prepend () { 86python populate_packages_prepend () {
86 cv_libdir = d.expand('${libdir}') 87 cv_libdir = d.expand('${libdir}')
diff --git a/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb b/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb
index 4e8b7d847b..4233ba430f 100644
--- a/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb
+++ b/meta-oe/recipes-support/pam-passwdqc/pam-passwdqc_1.0.5.bb
@@ -12,9 +12,9 @@ LICENSE = "BSD"
12LIC_FILES_CHKSUM = "file://LICENSE;md5=e284d013ef08e66d4737f446c5890550" 12LIC_FILES_CHKSUM = "file://LICENSE;md5=e284d013ef08e66d4737f446c5890550"
13 13
14SRC_URI = "http://www.openwall.com/pam/modules/pam_passwdqc/pam_passwdqc-1.0.5.tar.gz \ 14SRC_URI = "http://www.openwall.com/pam/modules/pam_passwdqc/pam_passwdqc-1.0.5.tar.gz \
15 file://1000patch-219201.patch \ 15 file://1000patch-219201.patch \
16 file://7000Makefile-fix-CC.patch \ 16 file://7000Makefile-fix-CC.patch \
17 " 17"
18SRC_URI[md5sum] = "cd9c014f736158b1a60384a8e2bdc28a" 18SRC_URI[md5sum] = "cd9c014f736158b1a60384a8e2bdc28a"
19SRC_URI[sha256sum] = "32528ddf7d8219c788b6e7702361611ff16c6340b6dc0f418ff164aadc4a4a88" 19SRC_URI[sha256sum] = "32528ddf7d8219c788b6e7702361611ff16c6340b6dc0f418ff164aadc4a4a88"
20 20
@@ -24,10 +24,11 @@ S = "${WORKDIR}/pam_passwdqc-${PV}"
24DEPENDS = "libpam" 24DEPENDS = "libpam"
25 25
26EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -Wall -fPIC -DHAVE_SHADOW" \ 26EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -Wall -fPIC -DHAVE_SHADOW" \
27 SECUREDIR=${base_libdir}/security" 27 SECUREDIR=${base_libdir}/security \
28"
28 29
29do_install() { 30do_install() {
30 oe_runmake install DESTDIR=${D} 31 oe_runmake install DESTDIR=${D}
31} 32}
32 33
33FILES_${PN} += "${base_libdir}/security/pam_passwdqc.so" 34FILES_${PN} += "${base_libdir}/security/pam_passwdqc.so"
diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.14.bb b/meta-oe/recipes-support/sharutils/sharutils_4.14.bb
index 49981e7f7a..d69e6ecbd4 100644
--- a/meta-oe/recipes-support/sharutils/sharutils_4.14.bb
+++ b/meta-oe/recipes-support/sharutils/sharutils_4.14.bb
@@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7inherit gettext autotools-brokensep 7inherit gettext autotools-brokensep
8 8
9SRC_URI = "ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz \ 9SRC_URI = "ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz \
10 file://fix-for-cross-compiling.patch \ 10 file://fix-for-cross-compiling.patch \
11 " 11"
12 12
13SRC_URI[md5sum] = "5686c11131b4c4c0841f8f3ef34d136a" 13SRC_URI[md5sum] = "5686c11131b4c4c0841f8f3ef34d136a"
14SRC_URI[sha256sum] = "90f5107c167cfd1b299bb211828d2586471087863dbed698f53109cd5f717208" 14SRC_URI[sha256sum] = "90f5107c167cfd1b299bb211828d2586471087863dbed698f53109cd5f717208"
15 15
16do_configure () { 16do_configure () {
17 oe_runconf 17 oe_runconf
18} 18}
diff --git a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb
index ac8593cb67..4a1b4ce670 100644
--- a/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb
+++ b/meta-oe/recipes-support/tomoyo-tools/tomoyo-tools_2.5.0.bb
@@ -22,9 +22,9 @@ DEPENDS = "linux-libc-headers ncurses"
22EXTRA_OEMAKE = "-e USRLIBDIR=${libdir}" 22EXTRA_OEMAKE = "-e USRLIBDIR=${libdir}"
23 23
24do_compile () { 24do_compile () {
25 oe_runmake 'CC=${CC}' 25 oe_runmake 'CC=${CC}'
26} 26}
27 27
28do_install() { 28do_install() {
29 oe_runmake install INSTALLDIR=${D} 29 oe_runmake install INSTALLDIR=${D}
30} 30}
diff --git a/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-oe/recipes-support/uim/uim_1.8.6.bb
index ae193b2008..76a41252d7 100644
--- a/meta-oe/recipes-support/uim/uim_1.8.6.bb
+++ b/meta-oe/recipes-support/uim/uim_1.8.6.bb
@@ -1,15 +1,14 @@
1DESCRIPTION = "A multilingual user input method library" 1DESCRIPTION = "A multilingual user input method library"
2HOMEPAGE = "http://uim.freedesktop.org/" 2HOMEPAGE = "http://uim.freedesktop.org/"
3LICENSE = "BSD-3-Clause & LGPLv2+" 3LICENSE = "BSD-3-Clause & LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b"
4SECTION = "inputmethods" 5SECTION = "inputmethods"
5 6
6SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2 \ 7SRC_URI = "http://uim.googlecode.com/files/uim-${PV}.tar.bz2"
7 "
8
9SRC_URI_append_class-target = "file://uim-module-manager.patch \
10 file://0001-fix-bug-for-cross-compile.patch"
11 8
12LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b" 9SRC_URI_append_class-target = " file://uim-module-manager.patch \
10 file://0001-fix-bug-for-cross-compile.patch \
11"
13SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59" 12SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59"
14SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f" 13SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f"
15 14
@@ -24,12 +23,13 @@ LEAD_SONAME = "libuim.so.1"
24inherit autotools pkgconfig gettext 23inherit autotools pkgconfig gettext
25 24
26EXTRA_OECONF += "--disable-emacs \ 25EXTRA_OECONF += "--disable-emacs \
27 --without-scim \ 26 --without-scim \
28 --without-m17nlib \ 27 --without-m17nlib \
29 --without-prime \ 28 --without-prime \
30 --without-canna \ 29 --without-canna \
31 --without-mana \ 30 --without-mana \
32 --without-eb" 31 --without-eb \
32"
33 33
34CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" 34CONFIGUREOPTS_remove_class-target = "--disable-silent-rules"
35 35
@@ -45,60 +45,62 @@ do_install_append() {
45PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-common uim-anthy libuim0 libuim-dev" 45PACKAGES += "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-common uim-anthy libuim0 libuim-dev"
46 46
47FILES_${PN} = "${bindir}/uim-help \ 47FILES_${PN} = "${bindir}/uim-help \
48 ${libdir}/uim/plugin/libuim-* \ 48 ${libdir}/uim/plugin/libuim-* \
49 ${libdir}/libuim-scm* \ 49 ${libdir}/libuim-scm* \
50 ${libdir}/libgcroots* \ 50 ${libdir}/libgcroots* \
51 ${libdir}/uim/plugin/libuim-*" 51 ${libdir}/uim/plugin/libuim-* \
52"
52 53
53FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ 54FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
54 ${libdir}/libuim-custom.so.* \ 55 ${libdir}/libuim-custom.so.* \
55 ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ 56 ${datadir}/locale/ja/LC_MESSAGES/uim.mo \
56 ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ 57 ${datadir}/locale/fr/LC_MESSAGES/uim.mo \
57 ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ 58 ${datadir}/locale/ko/LC_MESSAGES/uim.mo \
58 ${libdir}/libuim.so.*" 59 ${libdir}/libuim.so.* \
59 60"
60FILES_libuim-dev = "${libdir}/libuim*.a \ 61FILES_libuim-dev = "${libdir}/libuim*.a \
61 ${libdir}/libuim*.la \ 62 ${libdir}/libuim*.la \
62 ${libdir}/libuim*.so \ 63 ${libdir}/libuim*.so \
63 ${includedir}/uim \ 64 ${includedir}/uim \
64 ${libdir}/pkgconfig/uim.pc" 65 ${libdir}/pkgconfig/uim.pc \
65 66"
66FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ 67FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
67 ${datadir}/uim/anthy*.scm" 68 ${datadir}/uim/anthy*.scm \
68 69"
69FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" 70FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug"
70FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" 71FILES_${PN}-dev += "${libdir}/uim/plugin/*.la"
71 72
72FILES_uim-utils = "${bindir}/uim-sh \ 73FILES_uim-utils = "${bindir}/uim-sh \
73 ${bindir}/uim-module-manager \ 74 ${bindir}/uim-module-manager \
74 ${libexecdir}/uim-helper-server" 75 ${libexecdir}/uim-helper-server \
75 76"
76FILES_uim-xim = "${bindir}/uim-xim \ 77FILES_uim-xim = "${bindir}/uim-xim \
77 ${libexecdir}/uim-candwin-*gtk \ 78 ${libexecdir}/uim-candwin-*gtk \
78 ${libexecdir}/uim-candwin-*gtk3 \ 79 ${libexecdir}/uim-candwin-*gtk3 \
79 ${datadir}/man/man1/uim-xim.1 \ 80 ${datadir}/man/man1/uim-xim.1 \
80 ${sysconfdir}/X11/xinit/xinput.d/uim*" 81 ${sysconfdir}/X11/xinit/xinput.d/uim* \
81 82"
82FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ 83FILES_uim-common = "${datadir}/uim/pixmaps/*.png \
83 ${datadir}/uim" 84 ${datadir}/uim \
84 85"
85FILES_uim-fep = "${bindir}/uim-fep*" 86FILES_uim-fep = "${bindir}/uim-fep*"
86 87
87FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ 88FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \
88 ${bindir}/uim-toolbar-gtk \ 89 ${bindir}/uim-toolbar-gtk \
89 ${bindir}/uim-toolbar-gtk-systray \ 90 ${bindir}/uim-toolbar-gtk-systray \
90 ${bindir}/uim-*-gtk \ 91 ${bindir}/uim-*-gtk \
91 ${bindir}/uim-input-pad-ja \ 92 ${bindir}/uim-input-pad-ja \
92 ${libdir}/uim/uim-*-gtk" 93 ${libdir}/uim/uim-*-gtk \
93 94"
94FILES_uim-gtk3 = "${libdir}/gtk-3.0 \ 95FILES_uim-gtk3 = "${libdir}/gtk-3.0 \
95 ${bindir}/uim-toolbar-gtk3 \ 96 ${bindir}/uim-toolbar-gtk3 \
96 ${bindir}/uim-toolbar-gtk3-systray \ 97 ${bindir}/uim-toolbar-gtk3-systray \
97 ${bindir}/uim-*-gtk3 \ 98 ${bindir}/uim-*-gtk3 \
98 ${libdir}/uim/uim-*-gtk3" 99 ${libdir}/uim/uim-*-gtk3 \
99 100"
100FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ 101FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
101 ${datadir}/uim/skk*.scm" 102 ${datadir}/uim/skk*.scm \
103"
102 104
103pkg_postinst_uim-anthy() { 105pkg_postinst_uim-anthy() {
104 if [ -f /usr/bin/uim-module-manager ]; then 106 if [ -f /usr/bin/uim-module-manager ]; then
@@ -137,8 +139,8 @@ pkg_postrm_uim-skk() {
137pkg_postinst_uim-common() { 139pkg_postinst_uim-common() {
138 if [ -f /usr/bin/uim-module-manager ]; then 140 if [ -f /usr/bin/uim-module-manager ]; then
139 /usr/bin/uim-module-manager --path /etc/uim --register \ 141 /usr/bin/uim-module-manager --path /etc/uim --register \
140 tutcode tcode hangul viqr \ 142 tutcode tcode hangul viqr \
141 ipa-x-sampa latin byeoru 143 ipa-x-sampa latin byeoru
142 fi 144 fi
143} 145}
144 146
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
index 52a2f5688c..425f66b91b 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
@@ -15,5 +15,5 @@ RDEPENDS_${PN} = "tcl"
15RRECOMMENDS_${PN} = "usb-modeswitch-data" 15RRECOMMENDS_${PN} = "usb-modeswitch-data"
16 16
17do_install() { 17do_install() {
18 oe_runmake DESTDIR=${D} install 18 oe_runmake DESTDIR=${D} install
19} 19}