Changeset 7629


Ignorieren:
Zeitstempel:
17.09.2011 10:36:53 (vor 6 Jahren)
Autor:
oliver
Nachricht:

[freetz-stable-1.2]: Merge in r7452, r7470, r7522:7523, r7526, r7580, r7596, r7598, r7600, r7602:7603 from trunk (refs #1396):


r7452 | cuma | 2011-08-05 18:06:26 +0200 (Fr, 05. Aug 2011) | 3 Zeilen
replace-dtrace patch added:

  • execute a custom action by phone
  • thx hippie2000 for help

r7470 | oliver | 2011-08-12 10:24:44 +0200 (Fr, 12. Aug 2011) | 1 Zeile

  • replace dtrace: Update menuconfig help (by dileks)

r7522 | cuma | 2011-08-24 23:02:23 +0200 (Mi, 24. Aug 2011) | 2 Zeilen
customisation "tagging" added (refs #1470)
moved favicon-files to /graphics too


r7523 | cuma | 2011-08-25 01:30:31 +0200 (Do, 25. Aug 2011) | 1 Zeile
fix typo in r7522, thx schlimmchen (refs #1470)


r7526 | cuma | 2011-08-25 15:04:26 +0200 (Do, 25. Aug 2011) | 1 Zeile
tagging: use only one picture for both versions (refs #1470)


r7580 | cuma | 2011-09-05 23:45:57 +0200 (Mo, 05. Sep 2011) | 3 Zeilen
tagging:

  • add support for very old firmware, like 7050's
  • by buehmann, refs #1470

r7596 | oliver | 2011-09-11 19:44:58 +0200 (So, 11. Sep 2011) | 1 Zeile

  • squashfs: Allow blocksizes > 64 KB only for 2.6.13.1 and 2.6.19.2

r7598 | oliver | 2011-09-11 20:34:56 +0200 (So, 11. Sep 2011) | 2 Zeilen

  • external: Fix detection of external directory on nand (by capt_bluebaer)

r7600 | oliver | 2011-09-11 21:56:31 +0200 (So, 11. Sep 2011) | 2 Zeilen

  • usbroot: Replace AVM e2fsck with Freetz version (AVM version misses timestamp patch, r4806)

r7602 | cuma | 2011-09-12 13:13:13 +0200 (Mo, 12. Sep 2011) | 3 Zeilen
samba:

  • fix path & names of logfiles (by make)

closes #1496


r7603 | oliver | 2011-09-13 19:32:23 +0200 (Di, 13. Sep 2011) | 3 Zeilen

  • Fix W701V 7170 Alien patch (by dileks)

Ort:
branches/freetz-stable-1.2
Dateien:
5 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • branches/freetz-stable-1.2/CHANGELOG

    r7571 r7629  
    7575    * remove AVM's strace 
    7676    * remove chronyd 
     77    * replace dtrace: execute a custom action by phone 
    7778 
    7879- New packages, libs, modules: 
  • branches/freetz-stable-1.2/Config.in

    r7513 r7629  
    15591559        default "hansolo"       if FREETZ_FAVICON_HANSOLO 
    15601560 
     1561    choice 
     1562        prompt "Tagging" 
     1563        default FREETZ_TAGGING_NONE 
     1564        help 
     1565            Adds a tag to the AVM web-interface, so it is obvious to 
     1566            everybody that this box was modified by Freetz. 
     1567 
     1568        config FREETZ_TAGGING_NONE 
     1569            bool "none" 
     1570 
     1571        config FREETZ_TAGGING_CUMA 
     1572            bool "cuma's tagging" 
     1573 
     1574    endchoice 
     1575 
     1576    config FREETZ_TAGGING_STRING 
     1577        string 
     1578        default "none"          if FREETZ_TAGGING_NONE 
     1579        default "cuma"          if FREETZ_TAGGING_CUMA 
     1580 
    15611581endmenu 
    15621582 
     
    17621782            64 KB is the default for kernel 2.6 firmwares. 
    17631783 
    1764 if FREETZ_SHOW_ADVANCED && FREETZ_REPLACE_KERNEL 
     1784if FREETZ_SHOW_ADVANCED \ 
     1785    && FREETZ_REPLACE_KERNEL \ 
     1786    && ( \ 
     1787        FREETZ_KERNEL_VERSION_2_6_13_1 \ 
     1788        || FREETZ_KERNEL_VERSION_2_6_19_2 \ 
     1789    )     
    17651790    config FREETZ_SQUASHFS_BLOCKSIZE_131072 
    17661791        bool "128 KB (EXPERIMENTAL)" 
  • branches/freetz-stable-1.2/fwmod

    r7525 r7629  
    136136KERNEL_SUBDIR="kernel" 
    137137VARTAR_SUBDIR="var.tar" 
     138HTML_SUBDIR="usr/www" 
     139GRAPHICS_SUBDIR="graphics" 
    138140 
    139141KERNEL_IMAGE="var/tmp/kernel.image" 
     
    174176KERNEL_REP_DIR="${BASE_DIR}/kernel" 
    175177ADDON_DIR="${BASE_DIR}/addon" 
    176 FAVICON_DIR="${BASE_DIR}/favicon" 
     178GRAPHICS_DIR="${BASE_DIR}/${GRAPHICS_SUBDIR}" 
     179FAVICON_DIR="${GRAPHICS_DIR}/favicon" 
     180TAGGING_DIR="${GRAPHICS_DIR}/tagging" 
    177181 
    178182STATIC_PACKAGES_FILE="${BASE_DIR}/.static" 
     
    247251AVMPLUGINS_DIR="${KERNEL_DIR}/${AVMPLUGINS_SUBDIR}" 
    248252VARTAR_DIR="${KERNEL_DIR}/${VARTAR_SUBDIR}" 
     253HTML_DIR="${FILESYSTEM_DIR}/${HTML_SUBDIR}" 
    249254 
    250255KERNEL="${FIRMWARE_DIR}/${KERNEL_IMAGE}" 
     
    355360TARGET_SPECIFIC_ROOT_DIR="${PACKAGES_DIR}/root" 
    356361 
    357 HTML_MOD_DIR="${FILESYSTEM_MOD_DIR}/usr/www" 
     362HTML_MOD_DIR="${FILESYSTEM_MOD_DIR}/${HTML_SUBDIR}" 
    358363# HTML_LANG_MOD_DIR can't be defined here 
    359364MODULES_DIR="${FILESYSTEM_MOD_DIR}/${MODULES_SUBDIR}" 
     
    867872            cat .config | sed -e "s/#.*//g;/^$/d" > "$dot_config_file" 
    868873        fi 
     874        # tagging 
     875        if [ "$FREETZ_TAGGING_STRING" != "none" ]; then 
     876            echo1 "tagging avm webif (tag by ${FREETZ_TAGGING_STRING})" 
     877            # newer (small logo @left, eg 7270 04.88) 
     878            if [ -z "$tagging_files" ]; then 
     879                tagging_files="$(find ${HTML_MOD_DIR} -name kopfbalken_links.gif)" 
     880                tagging_position="center" 
     881                tagging_geometry="+0+0" 
     882            fi 
     883            # older (big header @top, eg 7141 04.76) 
     884            if [ -z "$tagging_files" ]; then 
     885                tagging_files="$(find ${HTML_MOD_DIR} -name fw_header980.gif)" 
     886                tagging_position="west" 
     887                tagging_geometry="+0+0" 
     888            fi 
     889            # even older (big header @top, eg 7050 04.03) 
     890            if [ -z "$tagging_files" ]; then 
     891                tagging_files="$(find ${HTML_MOD_DIR} -name fw_header.gif)" 
     892                tagging_position="west" 
     893                tagging_geometry="+0-5" 
     894            fi 
     895            # tagging 
     896            [ -z "$tagging_files" ] && error 1 "tagging failed, no files to tag found." 
     897            tagging_picture="${TAGGING_DIR}/${FREETZ_TAGGING_STRING}.png" 
     898            for tagging_file in $tagging_files; do 
     899                echo2 "${tagging_file}" 
     900                composite -dissolve 100% -gravity $tagging_position -geometry $tagging_geometry -quality 100 $tagging_picture $tagging_file $tagging_file 
     901                [ $? -ne 0 ] && error 1 "tagging failed while processing ${tagging_file#${FILESYSTEM_MOD_DIR}/}" 
     902            done 
     903        fi 
    869904    fi 
    870905 
  • branches/freetz-stable-1.2/make/samba/patches/160-fix_log.patch

    r4957 r7629  
    66  
    77-   pstr_sprintf(logfile, "%s/log.%s", arg, pname); 
    8 +   pstr_sprintf(logfile, "%s/log/%s.log", arg, pname); 
     8+   pstr_sprintf(logfile, "%s/%s.log", arg, pname); 
    99    lp_set_logfile(logfile); 
    1010 } 
    1111  
     12--- source/nmbd/nmbd.c  2009-09-30 14:21:56.000000000 +0200 
     13+++ source/nmbd/nmbd.c  2011-09-12 11:43:07.000000000 +0200 
     14@@ -680,7 +680,7 @@ 
     15    sys_srandom(time(NULL) ^ sys_getpid()); 
     16     
     17    if (!override_logfile) { 
     18-       slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE); 
     19+       slprintf(logfile, sizeof(logfile)-1, "%s/nmbd.log", dyn_LOGFILEBASE); 
     20        lp_set_logfile(logfile); 
     21    } 
     22     
  • branches/freetz-stable-1.2/make/samba/samba.mk

    r6404 r7629  
    8888$(PKG)_CONFIGURE_OPTIONS += --with-privatedir=/mod/etc/samba 
    8989$(PKG)_CONFIGURE_OPTIONS += --with-configdir=/mod/etc/samba 
     90$(PKG)_CONFIGURE_OPTIONS += --with-logfilebase=/var/log 
    9091$(PKG)_CONFIGURE_OPTIONS += --with-piddir=/var/run 
    9192$(PKG)_CONFIGURE_OPTIONS += --with-syslog 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.