* [PATCH 1/4] base.bbclass: Drop old style SRCDATE handling, we have pn- overrides now
2011-06-23 12:27 [PATCH 0/4] Misc core cleanups Richard Purdie
@ 2011-06-23 12:27 ` Richard Purdie
2011-06-23 12:27 ` [PATCH 2/4] base.bbclass: Since we require python 2.6 which always contains hashlib we can drop this fallback code Richard Purdie
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2011-06-23 12:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/base.bbclass | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 119b052..4681489 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -303,11 +303,6 @@ python () {
bb.note("SKIPPING %s because it's %s" % (pn, this_license))
raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
- # OBSOLETE in bitbake 1.7.4
- srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
- if srcdate != None:
- bb.data.setVar('SRCDATE', srcdate, d)
-
use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
if use_nls != None:
bb.data.setVar('USE_NLS', use_nls, d)
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] base.bbclass: Since we require python 2.6 which always contains hashlib we can drop this fallback code
2011-06-23 12:27 [PATCH 0/4] Misc core cleanups Richard Purdie
2011-06-23 12:27 ` [PATCH 1/4] base.bbclass: Drop old style SRCDATE handling, we have pn- overrides now Richard Purdie
@ 2011-06-23 12:27 ` Richard Purdie
2011-06-23 12:27 ` [PATCH 3/4] classes/conf: Drop MULTIMACH_ARCH variable, it adds unused complexity and serves no useful purpose Richard Purdie
2011-06-23 12:27 ` [PATCH 4/4] base/glib-2.0: Simplify USE_NLS handling for glib-2.0 Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2011-06-23 12:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/base.bbclass | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 4681489..f390f08 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -326,16 +326,6 @@ python () {
depends = depends + " osc-native:do_populate_sysroot"
bb.data.setVarFlag('do_fetch', 'depends', depends, d)
- # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback
- # on shasum-native. We need to ensure that it is staged before we fetch.
- if bb.data.getVar('PN', d, True) != "shasum-native":
- try:
- import hashlib
- except ImportError:
- depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
- depends = depends + " shasum-native:do_populate_sysroot"
- bb.data.setVarFlag('do_fetch', 'depends', depends, d)
-
# *.xz should depends on xz-native for unpacking
# Not endswith because of "*.patch.xz;patch=1". Need bb.decodeurl in future
if '.xz' in srcuri:
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] classes/conf: Drop MULTIMACH_ARCH variable, it adds unused complexity and serves no useful purpose
2011-06-23 12:27 [PATCH 0/4] Misc core cleanups Richard Purdie
2011-06-23 12:27 ` [PATCH 1/4] base.bbclass: Drop old style SRCDATE handling, we have pn- overrides now Richard Purdie
2011-06-23 12:27 ` [PATCH 2/4] base.bbclass: Since we require python 2.6 which always contains hashlib we can drop this fallback code Richard Purdie
@ 2011-06-23 12:27 ` Richard Purdie
2011-06-23 12:27 ` [PATCH 4/4] base/glib-2.0: Simplify USE_NLS handling for glib-2.0 Richard Purdie
3 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2011-06-23 12:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/base.bbclass | 8 +-------
meta/classes/cross-canadian.bbclass | 14 +++++++-------
meta/classes/sstate.bbclass | 4 ++--
meta/conf/bitbake.conf | 9 ++-------
4 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f390f08..0bea639 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -362,11 +362,8 @@ python () {
if local.startswith(mp):
#bb.note("overriding PACKAGE_ARCH from %s to %s" % (pkg_arch, mach_arch))
bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d)
- bb.data.setVar('MULTIMACH_ARCH', mach_arch, d)
return
- multiarch = pkg_arch
-
packages = bb.data.getVar('PACKAGES', d, 1).split()
for pkg in packages:
pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1)
@@ -375,10 +372,7 @@ python () {
# if multiple differences are present?
# Look through PACKAGE_ARCHS for the priority order?
if pkgarch and pkgarch == mach_arch:
- multiarch = mach_arch
- break
-
- bb.data.setVar('MULTIMACH_ARCH', multiarch, d)
+ bb.fatal("Recipe %s is marked as only being architecture specific but seems to have machine specific packages?" % d.getVar("PN", True))
}
def check_gcc3(data):
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 1a045ba..edd51da 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -9,14 +9,14 @@
# or indirectly via dependency. No need to be in 'world'.
EXCLUDE_FROM_WORLD = "1"
-STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
#
# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
#
-OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
+OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}"
-OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
+OLD_BASE_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
python () {
archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
@@ -25,7 +25,7 @@ python () {
sdkarchs.append(arch + '-nativesdk')
bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
}
-MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
+MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
INHIBIT_DEFAULT_DEPS = "1"
@@ -66,12 +66,12 @@ target_exec_prefix := "${exec_prefix}"
base_prefix = "${SDKPATHNATIVE}"
prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
-bindir = "${exec_prefix}/bin/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+bindir = "${exec_prefix}/bin/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
sbindir = "${bindir}"
base_bindir = "${bindir}"
base_sbindir = "${bindir}"
-libdir = "${exec_prefix}/lib/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-libexecdir = "${exec_prefix}/libexec/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+libdir = "${exec_prefix}/lib/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+libexecdir = "${exec_prefix}/libexec/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
FILES_${PN} = "${prefix}"
FILES_${PN}-dbg += "${prefix}/.debug \
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6358d39..14c90ec 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -5,8 +5,8 @@ SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
-SSTATE_PKGARCH = "${MULTIMACH_ARCH}"
-SSTATE_PKGSPEC = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
+SSTATE_PKGARCH = "${PACKAGE_ARCH}"
+SSTATE_PKGSPEC = "sstate-${PN}-${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c05d736..4e89500 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -99,9 +99,8 @@ PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
# since machine specific packages are handled using multimachine
PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"
-MULTIMACH_ARCH = "${PACKAGE_ARCH}"
-MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
+MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
@@ -317,8 +316,6 @@ STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
-# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
-# specific packages - hack around it for now.
STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}"
STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
@@ -329,8 +326,6 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
-# This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine
-# specific packages - hack around it for now.
STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}"
STAGING_DIR_TCBOOTSTRAP = "${STAGING_DIR_TARGET}-tcbootstrap"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] base/glib-2.0: Simplify USE_NLS handling for glib-2.0
2011-06-23 12:27 [PATCH 0/4] Misc core cleanups Richard Purdie
` (2 preceding siblings ...)
2011-06-23 12:27 ` [PATCH 3/4] classes/conf: Drop MULTIMACH_ARCH variable, it adds unused complexity and serves no useful purpose Richard Purdie
@ 2011-06-23 12:27 ` Richard Purdie
2011-06-23 23:46 ` Khem Raj
3 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2011-06-23 12:27 UTC (permalink / raw)
To: openembedded-core
Currently the only way to get anything to build is to set USE_NLS="yes"
for glib-2.0. We might as well do this in the recipe by default for
now and simpllify the code.
The magic handling of USE_NLS_<recipename> is also removed since this
can be done in the form USE_NLS_pn-<recipename> using overrides these
days.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/base.bbclass | 4 ----
meta/conf/distro/include/tclibc-uclibc.inc | 1 -
meta/recipes-core/glib-2.0/glib-2.0.inc | 6 ------
meta/recipes-core/glib-2.0/glib.inc | 3 +--
4 files changed, 1 insertions(+), 13 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0.inc
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0bea639..575352d 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -303,10 +303,6 @@ python () {
bb.note("SKIPPING %s because it's %s" % (pn, this_license))
raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
- use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
- if use_nls != None:
- bb.data.setVar('USE_NLS', use_nls, d)
-
# Git packages should DEPEND on git-native
srcuri = bb.data.getVar('SRC_URI', d, 1)
if "git://" in srcuri:
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 83418d6..65693a9 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -14,7 +14,6 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
USE_NLS ?= "no"
-USE_NLS_glib-2.0 = "yes"
CXXFLAGS += "-fvisibility-inlines-hidden"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
deleted file mode 100644
index ccbbd2b..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-python () {
- import bb
- if bb.data.getVar("USE_NLS", d, 1) == "no":
- raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0800c85..e25db3d 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
BUGTRACKER = "http://bugzilla.gnome.org"
SECTION = "libs"
-require glib-2.0.inc
-
DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
@@ -36,3 +34,4 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include"
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
ARM_INSTRUCTION_SET = "arm"
+USE_NLS = "yes"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 4/4] base/glib-2.0: Simplify USE_NLS handling for glib-2.0
2011-06-23 12:27 ` [PATCH 4/4] base/glib-2.0: Simplify USE_NLS handling for glib-2.0 Richard Purdie
@ 2011-06-23 23:46 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2011-06-23 23:46 UTC (permalink / raw)
To: openembedded-core
On 06/23/2011 05:27 AM, Richard Purdie wrote:
> Currently the only way to get anything to build is to set USE_NLS="yes"
> for glib-2.0. We might as well do this in the recipe by default for
> now and simpllify the code.
>
> The magic handling of USE_NLS_<recipename> is also removed since this
> can be done in the form USE_NLS_pn-<recipename> using overrides these
> days.
>
looks good to me
> Signed-off-by: Richard Purdie<richard.purdie@linuxfoundation.org>
> ---
> meta/classes/base.bbclass | 4 ----
> meta/conf/distro/include/tclibc-uclibc.inc | 1 -
> meta/recipes-core/glib-2.0/glib-2.0.inc | 6 ------
> meta/recipes-core/glib-2.0/glib.inc | 3 +--
> 4 files changed, 1 insertions(+), 13 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0.inc
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 0bea639..575352d 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -303,10 +303,6 @@ python () {
> bb.note("SKIPPING %s because it's %s" % (pn, this_license))
> raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
>
> - use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
> - if use_nls != None:
> - bb.data.setVar('USE_NLS', use_nls, d)
> -
> # Git packages should DEPEND on git-native
> srcuri = bb.data.getVar('SRC_URI', d, 1)
> if "git://" in srcuri:
> diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
> index 83418d6..65693a9 100644
> --- a/meta/conf/distro/include/tclibc-uclibc.inc
> +++ b/meta/conf/distro/include/tclibc-uclibc.inc
> @@ -14,7 +14,6 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
> PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
>
> USE_NLS ?= "no"
> -USE_NLS_glib-2.0 = "yes"
>
> CXXFLAGS += "-fvisibility-inlines-hidden"
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
> deleted file mode 100644
> index ccbbd2b..0000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0.inc
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -
> -python () {
> - import bb
> - if bb.data.getVar("USE_NLS", d, 1) == "no":
> - raise bb.parse.SkipPackage("${PN} requires native language support.")
> -}
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> index 0800c85..e25db3d 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
> BUGTRACKER = "http://bugzilla.gnome.org"
> SECTION = "libs"
>
> -require glib-2.0.inc
> -
> DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
> DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
> DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
> @@ -36,3 +34,4 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include"
> FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
>
> ARM_INSTRUCTION_SET = "arm"
> +USE_NLS = "yes"
^ permalink raw reply [flat|nested] 6+ messages in thread