From b6079b6c268d8df773e42a191f12c9afcd17d1c6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 7 Jan 2006 21:42:26 +0000 Subject: Convert CVSDATE -> SRCDATE. Also standardise cvs and svn PVs to x.x.x+cvsYYYYMMDD format and some includes some minor whitespace cleanup. --- classes/base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index b0ca9358bd..9b87828594 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -722,9 +722,9 @@ python __anonymous () { pn = bb.data.getVar('PN', d, 1) - cvsdate = bb.data.getVar('CVSDATE_%s' % pn, d, 1) - if cvsdate != None: - bb.data.setVar('CVSDATE', cvsdate, d) + 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: -- cgit v1.2.3 From 5a0a3d0fc64b0de84790b76655cdbe01b938bce0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 7 Jan 2006 23:13:10 +0000 Subject: image_ipk.bbclass: Set BUILD_ALL_DEPS = "1" for images in readyness of bitbake updates --- classes/image_ipk.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index 5fdd340673..f6af799e69 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -1,5 +1,8 @@ inherit rootfs_ipk +# We need to follow RDEPENDS and RRECOMMENDS for images +BUILD_ALL_DEPS = "1" + # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" -- cgit v1.2.3 From 01a76ec4e5aaeba0834437a5b4268008a0826fc3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Jan 2006 00:04:32 +0000 Subject: Move multimachine.inc to conf/distro/include/multimachine.conf and include it by default for familiar/openzaurus --- classes/multimachine.inc | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 classes/multimachine.inc (limited to 'classes') diff --git a/classes/multimachine.inc b/classes/multimachine.inc deleted file mode 100644 index 1f73ffd30f..0000000000 --- a/classes/multimachine.inc +++ /dev/null @@ -1,3 +0,0 @@ -STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel" -- cgit v1.2.3 From 7091dd78f0cc114fe3e748276363f09c2dfe820f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Jan 2006 00:29:11 +0000 Subject: Set some packages/classes PACKAGE_ARCH correctly and also correct some PACKAGE_ARCH= to . --- classes/image_ipk.bbclass | 1 + classes/native.bbclass | 1 + 2 files changed, 2 insertions(+) (limited to 'classes') diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index f6af799e69..c2f1c8d682 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -9,6 +9,7 @@ EXCLUDE_FROM_WORLD = "1" USE_DEVFS ?= "0" DEPENDS += "makedevs-native" +PACKAGE_ARCH = "${MACHINE_ARCH}" def get_image_deps(d): import bb diff --git a/classes/native.bbclass b/classes/native.bbclass index 955a8ae646..f0a77d6e11 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -5,6 +5,7 @@ inherit base EXCLUDE_FROM_WORLD = "1" PACKAGES = "" +PACKAGE_ARCH = "native" TARGET_ARCH = "${BUILD_ARCH}" TARGET_OS = "${BUILD_OS}" -- cgit v1.2.3 From c81e5f2d3a2fe31ac35ea4202294690becc0fc4e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 8 Jan 2006 10:56:44 +0000 Subject: native.bbclass: use BUILD_ARCH instead of 'native' --- classes/native.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/native.bbclass b/classes/native.bbclass index f0a77d6e11..feada55b3d 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -5,7 +5,7 @@ inherit base EXCLUDE_FROM_WORLD = "1" PACKAGES = "" -PACKAGE_ARCH = "native" +PACKAGE_ARCH = "${BUILD_ARCH}" TARGET_ARCH = "${BUILD_ARCH}" TARGET_OS = "${BUILD_OS}" -- cgit v1.2.3 From b2d178844371bb2d413eb6aed1e83a89783d7d96 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Jan 2006 12:29:18 +0000 Subject: Add PACKAGES_DYNAMIC to the appropriate .bb files. --- classes/kernel.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index ea99ec5401..2f9c65c8dd 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -5,6 +5,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} v inherit kernel-arch +PACKAGES_DYNAMIC = "kernel-module-*" + export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" KERNEL_IMAGETYPE = "zImage" -- cgit v1.2.3 From 00d6afcb893bec3fee68e3121c9d25999e833e27 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Jan 2006 14:56:12 +0000 Subject: Following from the meta/packages changes, cleanup conf/machine for incorrect DEPENDS usage. Move certain things into EXTRA_IMAGEDEPENDS. No valid users of EXTRA_BOOTSTRAP_DEPENDS were found so it was removed entirely. Change zaurus-updater not to package as it doesn't provide any. --- classes/package_ipk.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 6d3e1eb686..a70b1e8cdd 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -1,7 +1,6 @@ inherit package DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" -BOOTSTRAP_EXTRA_DEPENDS += "ipkg-collateral ipkg ipkg-link" PACKAGEFUNCS += "do_package_ipk" python package_ipk_fn () { -- cgit v1.2.3