From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 7 Dec 2004 22:05:47 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:packages.bb into handhelds.org:/home/kergoth/code/packages.bb 2004/12/07 04:58:25-06:00 ti.com!kergoth More updates per the core rename. 2004/12/07 04:46:51-06:00 ti.com!kergoth Update soundtracker per the core rename. 2004/12/07 04:44:14-06:00 ti.com!kergoth Merge 2004/12/07 04:42:38-06:00 ti.com!kergoth Updates per the recent rename of the oe core from 'oe' to 'bitbake'. BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw --- classes/module.bbclass | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 classes/module.bbclass (limited to 'classes/module.bbclass') diff --git a/classes/module.bbclass b/classes/module.bbclass new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From cf4cc850b024852964e694b649656936ac87b07a Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sun, 6 Mar 2005 12:10:53 +0000 Subject: if PARALLEL_INSTALL_MODULES==1, mangle module package names to allow parallel installation of both 2.6 and 2.4 versions BKrev: 422af34dUAf7zcVTUF0LfWk5i8bWAA --- classes/module.bbclass | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'classes/module.bbclass') diff --git a/classes/module.bbclass b/classes/module.bbclass index e69de29bb2..ac76967a76 100644 --- a/classes/module.bbclass +++ b/classes/module.bbclass @@ -0,0 +1,55 @@ +RDEPENDS += "kernel (${KERNEL_VERSION})" +DEPENDS += "virtual/kernel" + +inherit module-base + +python __anonymous() { + v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0" + if v == "1": + pn = bb.data.getVar("PN", d, 1) + kv = bb.data.getVar("KERNEL_VERSION", d, 1) + newpn = "%s-%s" % (pn, kv) + bb.data.setVar("PN", newpn, d) + bb.data.setVar("OLDPN", pn, d) + provides = bb.data.getVar("PROVIDES", d, 1) + if provides: + provides = "%s %s" % (provides, pn) + else: + provides = pn + bb.data.setVar("PROVIDES", provides, d) +} + +python populate_packages_prepend() { + v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0" + if v == "1": + kv = bb.data.getVar("KERNEL_VERSION", d, 1) + packages = bb.data.getVar("PACKAGES", d, 1) + for p in packages.split(): + pkg = bb.data.getVar("PKG_%s" % p, d, 1) or p + newpkg = "%s-%s" % (pkg, kv) + bb.data.setVar("PKG_%s" % p, newpkg, d) + rprovides = bb.data.getVar("RPROVIDES_%s" % p, d, 1) + if rprovides: + rprovides = "%s %s" % (rprovides, pkg) + else: + rprovides = pkg + bb.data.setVar("RPROVIDES_%s" % p, rprovides, d) +} + +module_do_compile() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ + KERNEL_SRC=${STAGING_KERNEL_DIR} \ + KERNEL_VERSION=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + ${MAKE_TARGETS} +} + +module_do_install() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install +} + +EXPORT_FUNCTIONS do_compile do_install + +FILES_${PN} = "/etc /lib/modules" -- cgit v1.2.3 From 421b90e8b79f7d55cd219fc68d856af19be33313 Mon Sep 17 00:00:00 2001 From: "ral@home" Date: Sun, 6 Mar 2005 17:14:16 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into alwin.at.home:/home/ral/progs/Zaurus/oe/openembedded 2005/03/06 17:10:16+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/03/06 17:09:17+00:00 nexus.co.uk!pb disable PN munging in module.bbclass to avoid ordering problems BKrev: 422b3a68ESSc02XMO9o0bM2Y349vBg --- classes/module.bbclass | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'classes/module.bbclass') diff --git a/classes/module.bbclass b/classes/module.bbclass index ac76967a76..4da3f5f30b 100644 --- a/classes/module.bbclass +++ b/classes/module.bbclass @@ -3,22 +3,6 @@ DEPENDS += "virtual/kernel" inherit module-base -python __anonymous() { - v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0" - if v == "1": - pn = bb.data.getVar("PN", d, 1) - kv = bb.data.getVar("KERNEL_VERSION", d, 1) - newpn = "%s-%s" % (pn, kv) - bb.data.setVar("PN", newpn, d) - bb.data.setVar("OLDPN", pn, d) - provides = bb.data.getVar("PROVIDES", d, 1) - if provides: - provides = "%s %s" % (provides, pn) - else: - provides = pn - bb.data.setVar("PROVIDES", provides, d) -} - python populate_packages_prepend() { v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0" if v == "1": -- cgit v1.2.3 From 7ab6bafabc5d7567f81cf1165b500dbb4227c409 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 21 Aug 2005 00:11:25 +0000 Subject: module.bbclass: run depmod/update-modules in postinst/postrm --- classes/module.bbclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'classes/module.bbclass') diff --git a/classes/module.bbclass b/classes/module.bbclass index 4da3f5f30b..8a13f1f858 100644 --- a/classes/module.bbclass +++ b/classes/module.bbclass @@ -34,6 +34,18 @@ module_do_install() { oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install } +pkg_postinst_append () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -A + update-modules || true +} + +pkg_postrm_append () { + update-modules || true +} + EXPORT_FUNCTIONS do_compile do_install FILES_${PN} = "/etc /lib/modules" -- cgit v1.2.3