From 2c09164fd4c11832865f18b72f46266b7abffbc7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 14 Nov 2009 00:57:51 +0000 Subject: kernel.bbclass: Fix populate_packaged 'D' references Signed-off-by: Richard Purdie --- classes/kernel.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 9c1f637a66..0dde2d33ca 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -333,7 +333,7 @@ python populate_packages_prepend () { def parse_depmod(): import os, re - dvar = bb.data.getVar('D', d, 1) + dvar = bb.data.getVar('PKGD', d, 1) if not dvar: bb.error("D not defined") return @@ -382,7 +382,7 @@ python populate_packages_prepend () { return deps def get_dependencies(file, pattern, format): - file = file.replace(bb.data.getVar('D', d, 1) or '', '', 1) + file = file.replace(bb.data.getVar('PKGD', d, 1) or '', '', 1) if module_deps.has_key(file): import os.path, re @@ -401,7 +401,7 @@ python populate_packages_prepend () { import re vals = extract_modinfo(file) - dvar = bb.data.getVar('D', d, 1) + dvar = bb.data.getVar('PKGD', d, 1) # If autoloading is requested, output /etc/modutils/ and append # appropriate modprobe commands to the postinst -- cgit v1.2.3 From bc465d83ad8665211b6f9664b418f4eafcc5ca6c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Nov 2009 10:45:23 +0000 Subject: classes: Drop a number of unneeded import calls (from Poky) Signed-off-by: Richard Purdie --- classes/kernel.bbclass | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 0dde2d33ca..8714aed0fd 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -8,9 +8,6 @@ KERNEL_IMAGETYPE ?= "zImage" # Add dependency on mkimage for kernels that build a uImage python __anonymous () { - - import bb - kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or '' if kerneltype == 'uImage': depends = bb.data.getVar("DEPENDS", d, 1) @@ -310,7 +307,7 @@ module_conf_rfcomm = "alias bt-proto-3 rfcomm" python populate_packages_prepend () { def extract_modinfo(file): - import tempfile, os, re + import tempfile, re tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1) tf = tempfile.mkstemp() tmpfile = tf[1] @@ -331,7 +328,7 @@ python populate_packages_prepend () { return vals def parse_depmod(): - import os, re + import re dvar = bb.data.getVar('PKGD', d, 1) if not dvar: @@ -385,7 +382,7 @@ python populate_packages_prepend () { file = file.replace(bb.data.getVar('PKGD', d, 1) or '', '', 1) if module_deps.has_key(file): - import os.path, re + import re dependencies = [] for i in module_deps[file]: m = re.match(pattern, os.path.basename(i)) @@ -463,7 +460,7 @@ python populate_packages_prepend () { do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='%skernel-%s' % (maybe_update_modules, bb.data.getVar("KERNEL_VERSION", d, 1))) - import re, os + import re metapkg = "kernel-modules" bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) bb.data.setVar('FILES_' + metapkg, "", d) -- cgit v1.2.3 From 2eb99471ec5f9c49a99b7349395d7dda0aee6b91 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Nov 2009 17:05:25 +0000 Subject: kernel.bbclass: Revert import os removal for now Signed-off-by: Richard Purdie --- classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 8714aed0fd..fe611ab087 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -306,6 +306,7 @@ module_conf_sco = "alias bt-proto-2 sco" module_conf_rfcomm = "alias bt-proto-3 rfcomm" python populate_packages_prepend () { + import os def extract_modinfo(file): import tempfile, re tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1) -- cgit v1.2.3 From a7affee8d4ce7f514648d07a1c59b05032d37778 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 18 Nov 2009 10:24:36 +0000 Subject: move menuconfig task from "after do_patch" to "after do_configure"; patch from Przemyslaw Wesolek --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/kernel.bbclass') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index fe611ab087..637805e6e3 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -215,7 +215,7 @@ do_menuconfig() { fi } do_menuconfig[nostamp] = "1" -addtask menuconfig after do_patch +addtask menuconfig after do_configure pkg_postinst_kernel () { cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true -- cgit v1.2.3