bump kernel patches and kernel configs

This commit is contained in:
Mario Fetka
2013-12-07 10:45:15 +01:00
parent 17a547c4f1
commit a4cf1adb6a
38 changed files with 59 additions and 72 deletions

View File

@@ -229,8 +229,8 @@ _get_real_kv_full() {
elif [[ "${OKV/.*}" = "3" ]]; then
# Linux 3.x support, KV_FULL is set to: 3.0-sablink
# need to add another final .0 to the version part
echo "${ORIGINAL_KV_FULL/-/.0-}"
#echo "${ORIGINAL_KV_FULL}"
#echo "${ORIGINAL_KV_FULL/-/.0-}"
echo "${ORIGINAL_KV_FULL}"
else
echo "${ORIGINAL_KV_FULL}"
fi
@@ -289,6 +289,19 @@ _is_kernel_lts() {
return 1
}
# Returns the arm kernel config file extension for the current subarch
_get_arm_subarch() {
local target="${CTARGET:-${CHOST}}"
local arm_arch=${target%%-*}
if [[ ${arm_arch} == armv7? ]]; then
echo "armv7"
elif [[ ${arm_arch} == armv6? ]]; then
echo "armv6"
elif [[ ${arm_arch} == armv5? ]]; then
echo "armv5"
fi
}
# provide extra virtual pkg
if _is_kernel_binary; then
PROVIDE="virtual/linux-binary"
@@ -312,8 +325,10 @@ if [ -z "${K_SABKERNEL_SELF_TARBALL_NAME}" ]; then
tmp_K_SABKERNEL_FW_CONFIG_FILE="${K_SABKERNEL_FW_CONFIG_FILE:-${K_SABKERNEL_NAME}-fw_env-__ARCH__.config}"
if [ -n "${K_SABCONFIGS_VER}" ]; then
K_SABCONFIGS_PKG="sablink-configs-${PV}-${K_SABCONFIGS_VER}.tar.${K_TARBALL_EXT}"
K_ARM_ARCH=$(_get_arm_subarch)
SRC_URI="${SRC_URI}
mirror://sablink/${CATEGORY}/linux-sablink-configs/${K_SABCONFIGS_PKG}"
mirror://sablink/${CATEGORY}/linux-sablink-configs/${K_SABCONFIGS_PKG}
arm? ( mirror://sablink/${CATEGORY}/linux-sablink-patches/config/${tmp_K_SABKERNEL_FW_CONFIG_FILE/__ARCH__/arm} )"
else
SRC_URI="${SRC_URI}
arm? ( mirror://sablink/${CATEGORY}/linux-sablink-patches/config/${tmp_K_SABKERNEL_FW_CONFIG_FILE/__ARCH__/arm} )
@@ -331,19 +346,6 @@ _is_config_file_set() {
[[ ${_config_file_set} = 1 ]]
}
# Returns the arm kernel config file extension for the current subarch
_get_arm_subarch() {
local target="${CTARGET:-${CHOST}}"
local arm_arch=${target%%-*}
if [[ ${arm_arch} == armv7? ]]; then
echo "armv7"
elif [[ ${arm_arch} == armv6? ]]; then
echo "armv6"
elif [[ ${arm_arch} == armv5? ]]; then
echo "armv5"
fi
}
_set_config_file_vars() {
# Setup kernel configuration file name
local pvr="${PVR}"
@@ -360,7 +362,7 @@ _set_config_file_vars() {
K_SABKERNEL_CONFIG_FILE="${K_SABKERNEL_CONFIG_FILE:-${K_SABKERNEL_NAME}-${pvr}-__ARCH__.config}"
K_SABKERNEL_FW_CONFIG_FILE="${K_SABKERNEL_FW_CONFIG_FILE:-${K_SABKERNEL_NAME}-fw_env-__ARCH__.config}"
use arm && K_SABKERNEL_CONFIG_FILE=${K_SABKERNEL_CONFIG_FILE/__ARCH__/$(_get_arm_subarch)}
use arm && K_SABKERNEL_FW_CONFIG_FILE=${K_SABKERNEL_FW_CONFIG_FILE/__ARCH__/$(_get_arm_subarch)}
use arm && K_SABKERNEL_FW_CONFIG_FILE=${K_SABKERNEL_FW_CONFIG_FILE/__ARCH__/arm}
use amd64 && K_SABKERNEL_CONFIG_FILE="${K_SABKERNEL_CONFIG_FILE/__ARCH__/amd64}"
use x86 && K_SABKERNEL_CONFIG_FILE="${K_SABKERNEL_CONFIG_FILE/__ARCH__/x86}"
else
@@ -381,7 +383,7 @@ _set_config_file_vars() {
elif use arm; then
K_SABKERNEL_CONFIG_FILE="${K_SABKERNEL_CONFIG_FILE/__ARCH__/$(_get_arm_subarch)}"
K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_ALT_CONFIG_FILE/__ARCH__/$(_get_arm_subarch)}"
K_SABKERNEL_FW_CONFIG_FILE="${K_SABKERNEL_FW_CONFIG_FILE/__ARCH__/$(_get_arm_subarch)}"
K_SABKERNEL_FW_CONFIG_FILE="${K_SABKERNEL_FW_CONFIG_FILE/__ARCH__/arm}"
fi
fi
@@ -879,9 +881,9 @@ _kernel_sources_src_install() {
}
_kernel_src_install() {
if use arm; then
_setup_mkimage_ramdisk || die "cannot setup mkimage"
fi
# if use arm; then
# _setup_mkimage_ramdisk || die "cannot setup mkimage"
# fi
dodir "${KV_OUT_DIR}"
insinto "${KV_OUT_DIR}"