summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-03-23 12:31:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:13:07 +0000
commit552eea2cb10f9631d3a905b7cf1866a880b4f657 (patch)
treef670e741dcb701cd995ce92c89e5f4a8cdde9b20 /meta
parent065a9a6c3baeecdba56bdf5d521aded111616394 (diff)
downloadpoky-552eea2cb10f9631d3a905b7cf1866a880b4f657.tar.gz
nativesdk/misc: set PKGSUFFIX for correct variable name expansion.
Set PKGSUFFIX in nativesdk.bbclass for correct variable name expansion. This would fix bunch of "not shipped" packaging warnings in "-nativesdk" recipes. And also bumping the corresponding PR. (From OE-Core rev: c69268305e6f814800b64f3a4be724c40b41108c) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/nativesdk.bbclass2
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb2
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc2
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb2
-rw-r--r--meta/recipes-support/sqlite/sqlite3_3.7.10.bb2
7 files changed, 8 insertions, 6 deletions
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index ceec53e86d..97c460c289 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -56,6 +56,8 @@ baselib = "lib"
56export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" 56export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
57export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 57export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
58 58
59PKGSUFFIX = "-nativesdk"
60
59python nativesdk_virtclass_handler () { 61python nativesdk_virtclass_handler () {
60 if not isinstance(e, bb.event.RecipePreFinalise): 62 if not isinstance(e, bb.event.RecipePreFinalise):
61 return 63 return
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 2e9b4d4059..9d5434f653 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
26# set "0" for qemu emulation of native localedef for locale generation 26# set "0" for qemu emulation of native localedef for locale generation
27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" 27LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
28 28
29PR = "r19" 29PR = "r20"
30 30
31PKGSUFFIX = "" 31PKGSUFFIX = ""
32PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 32PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index a4f59b62ce..e02c80fe44 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "15508" 3SRCREV = "15508"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r21" 6PR = "r22"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_BRANCH="eglibc-2_13"
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 3820f5aa09..644d904214 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "16540" 3SRCREV = "16540"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r1" 6PR = "r2"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_15" 9EGLIBC_BRANCH="eglibc-2_15"
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 689bd4ad10..14083d0cd1 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -11,7 +11,7 @@ DEPENDS_virtclass-native = "curl-native"
11DEPENDS_virtclass-nativesdk = "curl-nativesdk" 11DEPENDS_virtclass-nativesdk = "curl-nativesdk"
12 12
13PE = "1" 13PE = "1"
14INC_PR = "r8" 14INC_PR = "r9"
15 15
16FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg" 16FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg"
17 17
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
index 90b0cba037..b128d77f45 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
@@ -14,7 +14,7 @@ BBCLASSEXTEND = "native nativesdk"
14#FIXME: remove the following 14#FIXME: remove the following
15ARM_INSTRUCTION_SET = "arm" 15ARM_INSTRUCTION_SET = "arm"
16 16
17PR = "r0" 17PR = "r1"
18 18
19SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ 19SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
20 file://fix-tstamp-declaration.patch" 20 file://fix-tstamp-declaration.patch"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.10.bb b/meta/recipes-support/sqlite/sqlite3_3.7.10.bb
index 25e2b243ad..ec6ded6d30 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.7.10.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.10.bb
@@ -1,6 +1,6 @@
1require sqlite3.inc 1require sqlite3.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" 5LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
6 6