diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2012-03-23 12:31:51 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-23 12:13:07 +0000 |
commit | 552eea2cb10f9631d3a905b7cf1866a880b4f657 (patch) | |
tree | f670e741dcb701cd995ce92c89e5f4a8cdde9b20 /meta | |
parent | 065a9a6c3baeecdba56bdf5d521aded111616394 (diff) | |
download | poky-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.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/sqlite/sqlite3_3.7.10.bb | 2 |
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" | |||
56 | export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" | 56 | export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" |
57 | export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" | 57 | export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" |
58 | 58 | ||
59 | PKGSUFFIX = "-nativesdk" | ||
60 | |||
59 | python nativesdk_virtclass_handler () { | 61 | python 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 |
27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" | 27 | LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" |
28 | 28 | ||
29 | PR = "r19" | 29 | PR = "r20" |
30 | 30 | ||
31 | PKGSUFFIX = "" | 31 | PKGSUFFIX = "" |
32 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | 32 | PKGSUFFIX_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 | |||
3 | SRCREV = "15508" | 3 | SRCREV = "15508" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r21" | 6 | PR = "r22" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_13" | 9 | EGLIBC_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 | |||
3 | SRCREV = "16540" | 3 | SRCREV = "16540" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r1" | 6 | PR = "r2" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_15" | 9 | EGLIBC_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" | |||
11 | DEPENDS_virtclass-nativesdk = "curl-nativesdk" | 11 | DEPENDS_virtclass-nativesdk = "curl-nativesdk" |
12 | 12 | ||
13 | PE = "1" | 13 | PE = "1" |
14 | INC_PR = "r8" | 14 | INC_PR = "r9" |
15 | 15 | ||
16 | FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg" | 16 | FILESDIR = "${@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 |
15 | ARM_INSTRUCTION_SET = "arm" | 15 | ARM_INSTRUCTION_SET = "arm" |
16 | 16 | ||
17 | PR = "r0" | 17 | PR = "r1" |
18 | 18 | ||
19 | SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ | 19 | SRC_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 @@ | |||
1 | require sqlite3.inc | 1 | require sqlite3.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" | 5 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" |
6 | 6 | ||