Changeset 11318


Ignorieren:
Zeitstempel:
26.11.2013 09:45:06 (vor 5 Jahren)
Autor:
cuma
Nachricht:

fwmod: show kernel & uclibc versions

Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/fwmod

    r11301 r11318  
    977977        [ "$FREETZ_LIB_libuClibc" == "y" ] && cp -a "${TARGET_SPECIFIC_ROOT_DIR}/lib/libc.so.0" "${FILESYSTEM_MOD_DIR}/lib/" 
    978978 
     979        echo1 "checking uClibc" 
     980        DETECTED_UCLIBC_VER="$(find ${FILESYSTEM_DIR}/lib/libuClibc-*.so | sed -rn 's@.*/.*-(.*)\.so@\1@p')" 
     981        echo2 "configured uClibc version: ${FREETZ_TARGET_UCLIBC_VERSION}" 
     982        echo2 "version used by AVM image: $DETECTED_UCLIBC_VER" 
     983        if [ "${FREETZ_TARGET_UCLIBC_VERSION#$DETECTED_UCLIBC_VER}" == "$FREETZ_TARGET_UCLIBC_VERSION" \ 
     984          -a "${FREETZ_TARGET_UCLIBC_VERSION}" != "$DETECTED_UCLIBC_VER" ]; then 
     985            warn1 "by AVM used and configured uClibc versions does not match" 
     986        fi 
     987        unset DETECTED_UCLIBC_VER 
     988 
    979989        if [ "$FREETZ_SHARE_terminfo" == "y" ]; then 
    980990            echo1 "installing terminfos" 
     
    10551065    fi 
    10561066 
    1057     # check for modules directory / correctly configured kernel version 
    1058     if [ "${FILESYSTEM_MOD_DIR}/lib/modules/${FREETZ_MODULES_KVER}" != "$MODULES_DIR" ]; then 
     1067    # modules directory / correctly configured kernel version 
     1068    echo1 "checking kernel" 
     1069    echo2 "detected kernel version: ${MODULES_SUBDIR##*/}" 
     1070    echo2 "version used by sources: ${FREETZ_MODULES_KVER}" 
     1071    if [ "lib/modules/${FREETZ_MODULES_KVER}" != "$MODULES_SUBDIR" ]; then 
    10591072        if [ "$FREETZ_REPLACE_MODULE_AVAILABLE" == "y" ]; then 
    1060             error 1 "Automatically determined kernel modules directory ('${MODULES_SUBDIR}') doesn't match the configured one ('lib/modules/${FREETZ_MODULES_KVER}'). Wrong kernel version?" 
     1073            error 1 "Determined kernel version '${MODULES_SUBDIR##*/}' doesn't match the configured one '${FREETZ_MODULES_KVER}'. Wrong configured kernel version?" 
    10611074        else 
    1062             warn2 "Kernel modules directory is probably not correctly configured. Wrong kernel version?" 
    1063         fi 
    1064     fi 
    1065     echo1 "kernel modules directory: ${MODULES_SUBDIR}" 
     1075            warn2 "Kernel version is probably not correctly configured. Or no recent sources by AVM?" 
     1076        fi 
     1077    fi 
    10661078 
    10671079    if [ "$FREETZ_REPLACE_KERNEL" == "y" -o -n "$(set|grep ^FREETZ_MODULE_.*=y)" ]; then 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.