diff options
-rw-r--r-- | meta/classes-recipe/kernel.bbclass | 6 | ||||
-rw-r--r-- | meta/conf/documentation.conf | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 4bce64cf6a..271ce6c473 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass | |||
@@ -618,6 +618,7 @@ do_shared_workdir () { | |||
618 | # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware | 618 | # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware |
619 | SYSROOT_DIRS = "" | 619 | SYSROOT_DIRS = "" |
620 | 620 | ||
621 | KERNEL_LOCALVERSION ??= "" | ||
621 | KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} olddefconfig || oe_runmake -C ${S} O=${B} oldnoconfig" | 622 | KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} olddefconfig || oe_runmake -C ${S} O=${B} oldnoconfig" |
622 | 623 | ||
623 | python check_oldest_kernel() { | 624 | python check_oldest_kernel() { |
@@ -639,7 +640,10 @@ kernel_do_configure() { | |||
639 | # $ scripts/setlocalversion . => + | 640 | # $ scripts/setlocalversion . => + |
640 | # $ make kernelversion => 2.6.37 | 641 | # $ make kernelversion => 2.6.37 |
641 | # $ make kernelrelease => 2.6.37+ | 642 | # $ make kernelrelease => 2.6.37+ |
642 | touch ${B}/.scmversion ${S}/.scmversion | 643 | if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]; then |
644 | echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion | ||
645 | echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion | ||
646 | fi | ||
643 | 647 | ||
644 | if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then | 648 | if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then |
645 | mv "${S}/.config" "${B}/.config" | 649 | mv "${S}/.config" "${B}/.config" |
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index a27d7a53c3..66b8e2f24f 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -253,6 +253,7 @@ KERNEL_MODULE_PROBECONF[doc] = "Lists kernel modules for which the build system | |||
253 | KERNEL_PACKAGE_NAME[doc] = "Name prefix for kernel packages. Defaults to 'kernel'." | 253 | KERNEL_PACKAGE_NAME[doc] = "Name prefix for kernel packages. Defaults to 'kernel'." |
254 | KERNEL_PATH[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)." | 254 | KERNEL_PATH[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)." |
255 | KERNEL_SRC[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)." | 255 | KERNEL_SRC[doc] = "The location of the kernel sources. This variable is set to the value of the STAGING_KERNEL_DIR within the module class (module.bbclass)." |
256 | KERNEL_LOCALVERSION[doc] = "Appends a string to the name of the local version of the kernel image." | ||
256 | KFEATURE_DESCRIPTION[doc] = "Provides a short description of a configuration fragment. You use this variable in the .scc file that describes a configuration fragment file." | 257 | KFEATURE_DESCRIPTION[doc] = "Provides a short description of a configuration fragment. You use this variable in the .scc file that describes a configuration fragment file." |
257 | KMACHINE[doc] = "The machine as known by the kernel." | 258 | KMACHINE[doc] = "The machine as known by the kernel." |
258 | KTYPE[doc] = "Defines the kernel type to be used in assembling the configuration." | 259 | KTYPE[doc] = "Defines the kernel type to be used in assembling the configuration." |