diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 11 | ||||
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 9dca8b2403..7558c33682 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -41,7 +41,16 @@ def get_kernelversion(p): return m.group(1) return None +def get_kernelmajorversion(p): + import re + r = re.compile("([0-9]+\.[0-9]+).*") + m = r.match(p); + if m: + return m.group(1) + return None + KERNEL_VERSION = "${@get_kernelversion('${S}/include/linux/version.h')}" +KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" KERNEL_LOCALVERSION ?= "" @@ -340,7 +349,7 @@ 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) + kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) packages = bb.data.getVar("PACKAGES", d, 1) module_re = re.compile("^kernel-module-") for p in packages.split(): diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 7ed8342b1e..540d8404f0 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -30,9 +30,11 @@ real_do_rootfs () { mkdir -p ${IMAGE_ROOTFS}/dev - rm -f ${DEPLOY_DIR_IPK}/Packages - touch ${DEPLOY_DIR_IPK}/Packages - ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} + if -z "${DEPLOY_KEEP_PACKAGES}"; then + rm -f ${DEPLOY_DIR_IPK}/Packages + touch ${DEPLOY_DIR_IPK}/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} + fi mkdir -p ${T} echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}" |