--- trunk/include/kernel.sminc 2012/03/04 02:38:41 11362 +++ trunk/include/kernel.sminc 2012/03/04 14:16:15 11369 @@ -2,16 +2,20 @@ # $Id$ # needed extra vars: -# ${KERNEL_TYPE}: needed, 'sources', 'headers' or 'image' -# ${BRANCH}: needed, style branch of the kernel -# ${KERNEL_CONFIG}: optional, needed if you want to override the default -# searchpath ${SOURCEDIR}/${PNAME}/config-${PVER}-${BRANCH}-${PBUILD} +# ${KERNEL_TYPE}: needed, 'sources', 'headers' or 'image' +# ${BRANCH}: needed, style branch of the kernel +# ${KERNEL_CONFIG}: optional, needed if you want to override the default +# searchpath ${SOURCEDIR}/${PNAME}/config-${PVER}-${BRANCH}-${PBUILD} +# +# ${PSUBVER}: optional, only needed for 2.6.x.x naming scheme +# ${EXTRAVERSION}: optinal, extra version for the kernel name +# default setting is ${PSUBVER}-${BRANCH}-${PBUILD} +# ${KERNEL_IMAGE_PATH}: override the default KERNEL_IMAGE_PATH (to build xen images for e.g.) +# ${COMPRESS_MODULES}: compresses the kernel modules with given compressor (gzip|bzip2|xz) +# ${LINUX_FIRMWARE}: remove included firmware bits if requested +# set the version here like USE_LINUX_FIRMARE="20110605" +# version "internal" keeps the bits too # -# ${PSUBVER}: optional, only needed for 2.6.x.x naming scheme -# ${EXTRAVERSION}: optinal, extra version for the kernel name -# default setting is ${PSUBVER}-${BRANCH}-${PBUILD} -# ${KERNEL_IMAGE_PATH}: override the default KERNEL_IMAGE_PATH (to build xen images for e.g.) -# ${COMPRESS_MODULES}: compresses the kernel modules with given compressor (gzip|bzip2|xz) sminclude mtools @@ -23,15 +27,6 @@ KERNEL_ARCH_EXTENSION="" fi -# remove included firmware bits if requested -# set the version here like USE_LINUX_FIRMARE="20110605" -# version "internal" keeps the bits too -if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]] -then - DEPEND="${DEPEND} - >= sys-kernel/linux-firmware-${LINUX_FIRMWARE}" -fi - if [[ ! -z ${COMPRESS_MODULES} ]] then case ${COMPRESS_MODULES} in @@ -90,6 +85,11 @@ >= sys-fs/udev-115 >= virtual/initramfs-tools >= virtual/initscripts"} + if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]] + then + DEPEND="${DEPEND} + >= sys-kernel/linux-firmware-${LINUX_FIRMWARE}" + fi : ${DESCRIPTION="Kernel image of the '${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}' kernel branch."} ;;