From 86123c1f8c95b10a1aee30b96b3ed86dfe7a6b88 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 12 Oct 2006 10:53:31 +0000 Subject: base.bbclass: make showing display revision work with the mtn 0.30 workspace format --- classes/base.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 0c62568107..a9b61d26b1 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -505,6 +505,9 @@ python base_eventhandler() { monotone_revision = "" try: monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip() + if monotone_revision.startswith( "format_version" ): + monotone_revision_words = monotone_revision.split() + monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1] except IOError: pass bb.data.setVar( 'OE_REVISION', monotone_revision, e.data ) -- cgit v1.2.3 From 778f202e7d0113f2fb3f3ea029ce4ae902d938eb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Oct 2006 23:37:03 +0000 Subject: base.bbclass: Add fetchall task to fetch all sources for all the given task and all its dependencies (requires bitbake trunk) --- classes/base.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index a9b61d26b1..4aaee3686c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -382,6 +382,12 @@ python base_do_fetch() { raise bb.build.FuncFailed("Fetch failed: %s" % value) } +addtask fetchall +do_fetchall[recrdeptask] = "do_fetch" +python base_do_fetchall() { + bb.build.exec_task('do_fetch', d) +} + def oe_unpack_file(file, data, url = None): import bb, os if not url: @@ -741,7 +747,7 @@ python () { # Patch handling inherit patch -EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild +EXPORT_FUNCTIONS do_clean do_mrproper do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_stage do_rebuild do_fetchall MIRRORS[func] = "0" MIRRORS () { -- cgit v1.2.3 From 1e671c11a8b6f140e11b9cb38c3728cce90f0665 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 20 Oct 2006 12:29:43 +0000 Subject: base.bbclass: remove oesources.org --- classes/base.bbclass | 5 ----- 1 file changed, 5 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 4aaee3686c..0e864457ab 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -791,10 +791,5 @@ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ - - - -ftp://.*/.*/ http://www.oesources.org/source/current/ -http://.*/.*/ http://www.oesources.org/source/current/ } -- cgit v1.2.3 From 397184fc7c2bdc9f535c5f7298656474bfab284c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Oct 2006 15:11:41 +0000 Subject: base/package.bbclass: Clean up and document things a bit more. Should be no functional changes (from poky) --- classes/base.bbclass | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 0e864457ab..6c158e9ef7 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -619,27 +619,6 @@ def explode_deps(s): r.append(i) return r -python read_shlibdeps () { - packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() - for pkg in packages: - rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") - shlibsfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".shlibdeps", d) - if os.access(shlibsfile, os.R_OK): - fd = file(shlibsfile) - lines = fd.readlines() - fd.close() - for l in lines: - rdepends.append(l.rstrip()) - pcfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".pcdeps", d) - if os.access(pcfile, os.R_OK): - fd = file(pcfile) - lines = fd.readlines() - fd.close() - for l in lines: - rdepends.append(l.rstrip()) - bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) -} - def read_pkgdatafile(fn): pkgdata = {} -- cgit v1.2.3 From a8be7e0efd18848795c0253a7e99128e028a3768 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Oct 2006 16:09:20 +0000 Subject: package.bbclass: Split into two tasks, one which prepares the packages and then package_write which actually generates the packages. The two stage approach allows us to avoid circular dependency issues from classes like debian.bbclass. As the data being emitted into pkgdata/ changed, you need to either wipe tmp or rerun the do_package tasks (wipe the do_package stamps). Everything will repackage anyway due to the new task. --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 6c158e9ef7..7022236ca3 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -575,7 +575,7 @@ do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T ${STAGING_DATADIR} \ ${S} ${B}" -addtask populate_staging after do_package +addtask populate_staging after do_package_write python do_populate_staging () { bb.build.exec_func('do_stage', d) -- cgit v1.2.3 From 3bdc6a13089e9839e56766de1930e8b49ef92344 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Oct 2006 16:28:44 +0000 Subject: base.bbclass: Remove some pointless presumably dead code --- classes/base.bbclass | 3 --- 1 file changed, 3 deletions(-) (limited to 'classes/base.bbclass') diff --git a/classes/base.bbclass b/classes/base.bbclass index 7022236ca3..eda1b23b04 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -599,9 +599,6 @@ do_build[func] = "1" # Functions that update metadata based on files outputted # during the build process. -SHLIBS = "" -RDEPENDS_prepend = " ${SHLIBS}" - def explode_deps(s): r = [] l = s.split() -- cgit v1.2.3