Changeset 5676


Ignorieren:
Zeitstempel:
31.08.2010 19:07:55 (vor 8 Jahren)
Autor:
oliver
Nachricht:

[freetz-stable-1.1]: Merg in r5410:5411, r5427:5428, r5455, r5461:5463, r 5479, r5501, r5504, r5509:5510, r5528, r5542, r5568, r5604, r5622, r5626, r5644 from trunk


r5410 | oliver | 2010-08-05 16:49:49 +0200 (Thu, 05 Aug 2010) | 1 line

  • Makefile: Delete built firmware images only on distclean

r5411 | oliver | 2010-08-05 17:02:00 +0200 (Thu, 05 Aug 2010) | 2 lines

  • Makefile: Use builtin $(RM) instead of "rm -f"

r5427 | oliver | 2010-08-07 15:03:50 +0200 (Sat, 07 Aug 2010) | 3 lines

  • 7570: Add AVM kernel source
    • enable "replace kernel"
    • Sources seem to be older than 7270 04.80

r5428 | oliver | 2010-08-07 15:04:58 +0200 (Sat, 07 Aug 2010) | 1 line

  • 7570: Fix patch copied in last commit

r5455 | oliver | 2010-08-09 11:06:05 +0200 (Mon, 09 Aug 2010) | 2 lines

  • 7570: Add missing mcfw functions to kernel

r5461 | oliver | 2010-08-10 10:38:43 +0200 (Tue, 10 Aug 2010) | 1 line

  • libmad: Overwrite CFLAGS, when building with -O2 incompatible optimizations are added

r5462 | oliver | 2010-08-10 11:14:02 +0200 (Tue, 10 Aug 2010) | 3 lines

  • Bump 7240/7270 v2/v3 Labor Preview to 18012

r5463 | Whoopie | 2010-08-10 13:07:08 +0200 (Tue, 10 Aug 2010) | 2 lines
uClibc: add patch to fix use-after-free bug in dns_lookup in 0.9.29


r5479 | oliver | 2010-08-11 22:36:08 +0200 (Wed, 11 Aug 2010) | 1 line

  • remove dtrace: Enable for 7570

r5501 | oliver | 2010-08-13 23:59:14 +0200 (Fri, 13 Aug 2010) | 3 lines

  • Bump 7240/7270 v2/v3 Labor Preview to 18061

r5504 | oliver | 2010-08-14 11:30:21 +0200 (Sat, 14 Aug 2010) | 1 line

  • Update uClibc URL

r5509 | oliver | 2010-08-14 18:07:56 +0200 (Sat, 14 Aug 2010) | 1 line

  • kernel: Don't display nfs modules in menuconfig for 2.6.19.2 because they are built into the kernel directly

r5510 | oliver | 2010-08-14 18:28:09 +0200 (Sat, 14 Aug 2010) | 1 line

  • Fix FIRMWARES file; why do we have 2 entries for 2170?

r5528 | oliver | 2010-08-16 00:30:48 +0200 (Mon, 16 Aug 2010) | 4 lines

  • uclibc++: Fix static linking of libs
    • Use slow but working —start-group —end-group ld switch
    • Rename wrapper patch

r5542 | oliver | 2010-08-17 14:04:47 +0200 (Tue, 17 Aug 2010) | 2 lines


r5568 | cinereous | 2010-08-18 16:38:44 +0200 (Wed, 18 Aug 2010) | 1 line

7240,7270 preview: bump to xx.04.85-18061


r5604 | oliver | 2010-08-21 12:19:22 +0200 (Sat, 21 Aug 2010) | 2 lines

  • Bump 7240/7270 v2/v3 Labor Preview to 18101

r5622 | oliver | 2010-08-25 11:25:41 +0200 (Wed, 25 Aug 2010) | 2 lines

  • Bump 7240/7270 v2/v3 Labor Preview to 18145

r5626 | oliver | 2010-08-25 20:22:06 +0200 (Wed, 25 Aug 2010) | 1 line

  • Enable "remove AVM vpn" patch for 7570

r5644 | Whoopie | 2010-08-27 16:56:21 +0200 (Fri, 27 Aug 2010) | 2 lines
modcgi: bump version to 0.3, move patch out of the tarball to typical patches directory, fix typo from r5640 in 100-proccgi.patch.


Ort:
branches/freetz-stable-1.1
Dateien:
1 gelöscht
15 bearbeitet
9 kopiert

Legende:

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

  • branches/freetz-stable-1.1/Config.in

    r5407 r5676  
    2929config FREETZ_AVM_VERSION_7270_04_80 
    3030    bool 
     31config FREETZ_AVM_VERSION_7570_04_82 
     32    bool 
    3133config FREETZ_AVM_VERSION_r7203 
    3234    bool 
     
    117119 
    118120    config FREETZ_TYPE_FON_WLAN_7570 
    119         select FREETZ_AVM_VERSION_7270_04_80 
     121        select FREETZ_AVM_VERSION_7570_04_82 
    120122        bool "Fon WLAN 7570 VDSL" 
    121123 
     
    288290    default "3270_04.80"        if FREETZ_AVM_VERSION_3270_04_80 
    289291    default "7270_04.80"        if FREETZ_AVM_VERSION_7270_04_80 
     292    default "7570_04.82"        if FREETZ_AVM_VERSION_7570_04_82 
    290293    default "r7203"         if FREETZ_AVM_VERSION_r7203 
    291294 
     
    439442        FREETZ_SHOW_ADVANCED && \ 
    440443        ! ((FREETZ_TYPE_LABOR_DSL || FREETZ_TYPE_LABOR_CORE || FREETZ_TYPE_LABOR_IPV6 || FREETZ_TYPE_LABOR_PHONE) && (FREETZ_TYPE_FON_WLAN_7270 || FREETZ_TYPE_FON_WLAN_7270_V3)) && \ 
    441         ! FREETZ_TYPE_FON_WLAN_7570 && \ 
    442444        ! (FREETZ_TYPE_FON && FREETZ_TYPE_LANG_EN) 
    443445    default y 
     
    448450        FREETZ_SHOW_ADVANCED && \ 
    449451        FREETZ_REPLACE_KERNEL_AVAILABLE 
    450     select FREETZ_MODULE_fuse if (FREETZ_AVM_VERSION_3270_04_80 || FREETZ_AVM_VERSION_7270_04_80) 
     452    select FREETZ_MODULE_fuse if ( \ 
     453                    FREETZ_AVM_VERSION_3270_04_80 || \ 
     454                    FREETZ_AVM_VERSION_7270_04_80 || \ 
     455                    FREETZ_AVM_VERSION_7570_04_82 \ 
     456                    ) 
    451457    default n 
    452458    help 
     
    14581464            FREETZ_TYPE_FON_WLAN_7270 || \ 
    14591465            FREETZ_TYPE_FON_WLAN_7270_V3 || \ 
     1466            FREETZ_TYPE_FON_WLAN_7570 || \ 
    14601467            FREETZ_TYPE_WLAN_3170 \ 
    14611468        ) 
     
    15401547        FREETZ_TYPE_FON_WLAN_7240 || \ 
    15411548        FREETZ_TYPE_FON_WLAN_7270 || \ 
    1542         FREETZ_TYPE_FON_WLAN_7270_V3 
    1543     default y if FREETZ_TYPE_FON_WLAN_7270 
    1544     default n 
     1549        FREETZ_TYPE_FON_WLAN_7270_V3 || \ 
     1550        FREETZ_TYPE_FON_WLAN_7570 
     1551    default y 
    15451552    help 
    15461553        Remove /usr/bin/dtrace. This utility is only needed to 
     
    16711678    default "@AVM/fritz.box/fritzbox.wlan_3270/x_misc/opensrc"          if  FREETZ_AVM_VERSION_3270_04_80 
    16721679    default "@AVM/fritz.box/fritzbox.fon_wlan_7270/x_misc/opensrc"          if  FREETZ_AVM_VERSION_7270_04_80 
     1680    default "@AVM/fritz.box/fritzbox.fon_wlan_7570/x_misc/opensrc"          if  FREETZ_AVM_VERSION_7570_04_82 
    16731681    default "http://www.t-home.de/dlp/eki/downloads/Speedport/Speedport_W501V"  if  FREETZ_AVM_VERSION_r7203 
    16741682 
     
    16861694    default "fritz_box_wlan_3270_source _files .04.80.tar.gz" if    FREETZ_AVM_VERSION_3270_04_80 
    16871695    default "fritzbox7270-source-files-04.80.tar.gz"    if  FREETZ_AVM_VERSION_7270_04_80 
     1696    default "fritzbox7570-source-files-04.78-82.tar.gz" if  FREETZ_AVM_VERSION_7570_04_82 
    16881697    default "GPL-r7203-4mb_26-tar.bz2"          if  FREETZ_AVM_VERSION_r7203 
    16891698 
     
    17011710    default "a7e605a9f27bf514b232ec9976b9ff98"      if  FREETZ_AVM_VERSION_3270_04_80 
    17021711    default "bcd49b28a54293e1481b8170b07245e0"      if  FREETZ_AVM_VERSION_7270_04_80 
     1712    default "d5f0320bbc4c86a79870ed87ef3650e4"      if  FREETZ_AVM_VERSION_7570_04_82 
    17031713    default "582c74f0959a687c41c1bcfa599ace9c"      if  FREETZ_AVM_VERSION_r7203 
    17041714 
     
    18411851    default "FRITZ.Box_Fon_WLAN_7240.73.04.80.image"            if  FREETZ_TYPE_FON_WLAN_7240 && \ 
    18421852                                            ! FREETZ_TYPE_LABOR 
    1843     default "Labor_FRITZ.Box_Fon_WLAN_7240.73.04.85-17971.image"        if  FREETZ_TYPE_FON_WLAN_7240 && \ 
     1853    default "Labor_FRITZ.Box_Fon_WLAN_7240.73.04.85-18145.image"        if  FREETZ_TYPE_FON_WLAN_7240 && \ 
    18441854                                            FREETZ_TYPE_PREVIEW 
    18451855    default "FRITZ.Box_Fon_WLAN_7270.54.04.80.image"            if  FREETZ_TYPE_FON_WLAN_7270 && \ 
     
    18561866    default "FRITZ.Box_Fon_WLAN_7270_16_LabNAS.AnnexB.54.04.80-16561.image" if  FREETZ_TYPE_FON_WLAN_7270_16MB && \ 
    18571867                                            FREETZ_TYPE_LABOR_NAS 
    1858     default "Labor_FRITZ.Box_Fon_WLAN_7270_v2.54.04.85-17971.image"     if  FREETZ_TYPE_FON_WLAN_7270 && \ 
     1868    default "Labor_FRITZ.Box_Fon_WLAN_7270_v2.54.04.85-18145.image"     if  FREETZ_TYPE_FON_WLAN_7270 && \ 
    18591869                                            FREETZ_TYPE_PREVIEW 
    18601870    default "FRITZ.Box_Fon_WLAN_7270_v3.74.04.80.image"         if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
     
    18691879    default "FRITZ.Box_Fon_WLAN_7270_v3_LabNAS.AnnexB.74.04.80-16561.image" if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
    18701880                                            FREETZ_TYPE_LABOR_NAS 
    1871     default "Labor_FRITZ.Box_Fon_WLAN_7270_v3.74.04.85-17971.image"     if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
     1881    default "Labor_FRITZ.Box_Fon_WLAN_7270_v3.74.04.85-18145.image"     if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
    18721882                                            FREETZ_TYPE_PREVIEW 
    18731883    default "FRITZ.Box_Fon_WLAN_7570_vDSL.en-de-fr.75.04.82.image"      if  FREETZ_TYPE_FON_WLAN_7570 
  • branches/freetz-stable-1.1/FIRMWARES

    r5064 r5676  
    88    * Fritz!Box Fon (English, Annex A): 39.04.49 
    99    * Fritz!Box Fon (English, Annex B): 30.04.49 
    10     * Fritz!Box 2170: 51.04.34 
    1110* Fritz!Box 5010 (A-CH, Annex A): 48.04.43 
    1211* Fritz!Box Fon 5050: 12.04.31 
  • branches/freetz-stable-1.1/Makefile

    r5064 r5676  
    267267 
    268268package-list-clean: 
    269     @rm -f .static .dynamic 
     269    @$(RM) .static .dynamic 
    270270 
    271271ifeq ($(FWMOD_NOPACK),y) 
     
    417417    echo "The following elements have been deactivated:"; \ 
    418418    diff -U 0 .config_tmp .config | sed -rn 's/^\+# ([^ ]+).*/  \1/p'; \ 
    419     rm -f .config_tmp; \ 
     419    $(RM) .config_tmp; \ 
    420420    } 
    421421 
     
    429429common-clean: 
    430430    ./fwmod_custom clean 
    431     rm -f .static .dynamic 
    432     rm -f .exclude .exclude-dist-tmp 
    433     rm -f $(FW_IMAGES_DIR)/* 
    434     rm -rf $(BUILD_DIR) 
     431    $(RM) .static .dynamic .exclude .exclude-dist-tmp 
     432    $(RM) -r $(BUILD_DIR) 
    435433    -$(MAKE) -C $(CONFIG) clean 
    436434 
    437435common-dirclean: common-clean 
    438     rm -rf $(BUILD_DIR) $(PACKAGES_DIR) $(SOURCE_DIR) 
    439     rm -f .new-uclibc .old-uclibc 
     436    $(RM) -r $(BUILD_DIR) $(PACKAGES_DIR) $(SOURCE_DIR) 
     437    $(RM) .new-uclibc .old-uclibc 
    440438    find `[ -d $(ROOT_DIR)/lib ] && echo $(ROOT_DIR)/lib` \ 
    441439        `[ -d $(ROOT_DIR)/usr/lib ] && echo $(ROOT_DIR)/usr/lib` \ 
    442         -type d -name .svn -prune -false , -name "*.so*" -exec rm {} \; 
    443     find $(MAKE_DIR) -name ".*_config" -exec rm {} \; 
     440        -type d -name .svn -prune -false , -name "*.so*" -exec $(RM) {} \; 
     441    find $(MAKE_DIR) -name ".*_config" -exec $(RM) {} \; 
    444442    -cp .defstatic $(ADDON_DIR)/static.pkg 
    445443    -cp .defdynamic $(ADDON_DIR)/dynamic.pkg 
    446444 
    447 common-distclean: common-clean 
    448     rm -f .config .config.old .config.cmd .tmpconfig.h 
    449     rm -rf $(TOOLCHAIN_BUILD_DIR) 
    450     rm -rf $(DL_DIR) $(PACKAGES_DIR) $(SOURCE_DIR) 
    451     rm -f make/config.cache .new-uclibc .old-uclibc 
    452     find `[ -d $(ROOT_DIR)/lib ] && echo $(ROOT_DIR)/lib` \ 
    453         `[ -d $(ROOT_DIR)/usr/lib ] && echo $(ROOT_DIR)/usr/lib` \ 
    454         -type d -name .svn -prune -false , -name "*.so*" -exec rm {} \; 
    455     find $(MAKE_DIR) -name ".*_config" -exec rm {} \; 
    456     -rm -rf $(ADDON_DIR)/* 
    457     -cp .defstatic $(ADDON_DIR)/static.pkg 
    458     -cp .defdynamic $(ADDON_DIR)/dynamic.pkg 
     445common-distclean: common-dirclean 
     446    $(RM) .config .config.old .config.cmd .tmpconfig.h 
     447    -$(RM) -r $(ADDON_DIR)/* 
     448    $(RM) -r $(DL_DIR) 
     449    $(RM) -r $(FW_IMAGES_DIR) 
     450    $(RM) -r $(SOURCE_DIR) 
     451    $(RM) -r $(TOOLCHAIN_BUILD_DIR) 
    459452 
    460453dist: distclean 
     
    475468        cd "$$curdir"; \ 
    476469    ) 
    477     rm -f .exclude-dist-tmp 
     470    $(RM) .exclude-dist-tmp 
    478471 
    479472# Check if last build was with older svn version 
  • branches/freetz-stable-1.1/kernel/Config.in

    r3077 r5676  
    249249config FREETZ_MODULE_lockd 
    250250    bool "lockd.ko" 
     251    depends on FREETZ_KERNEL_VERSION_2_6_13_1 
    251252    select FREETZ_MODULE_sunrpc 
    252253    default n 
     
    262263config FREETZ_MODULE_nfsd 
    263264    bool "nfsd.ko" 
     265    depends on FREETZ_KERNEL_VERSION_2_6_13_1 
    264266    select FREETZ_MODULE_lockd 
    265267    select FREETZ_MODULE_exportfs 
     
    268270config FREETZ_MODULE_exportfs 
    269271    bool "exportfs.ko" 
     272    depends on FREETZ_KERNEL_VERSION_2_6_13_1 
    270273    default n 
    271274 
    272275config FREETZ_MODULE_nfs 
    273276    bool "nfs.ko" 
     277    depends on FREETZ_KERNEL_VERSION_2_6_13_1 
    274278    select FREETZ_MODULE_lockd 
    275279    default n 
     
    364368config FREETZ_MODULE_sunrpc 
    365369    bool "sunrpc.ko" 
    366     default n 
    367  
    368 endmenu 
     370    depends on FREETZ_KERNEL_VERSION_2_6_13_1 
     371    default n 
     372 
     373endmenu 
  • branches/freetz-stable-1.1/make/libs/libmad.mk

    r4301 r5676  
    1919$($(PKG)_BINARY): $($(PKG)_DIR)/.configured 
    2020    PATH=$(TARGET_TOOLCHAIN_PATH) \ 
    21         $(MAKE) -C $(LIBMAD_DIR) 
     21        $(MAKE) -C $(LIBMAD_DIR) \ 
     22        CFLAGS="$(TARGET_CFLAGS)" 
    2223 
    2324$($(PKG)_STAGING_BINARY): $($(PKG)_BINARY) 
  • branches/freetz-stable-1.1/make/linux/Config.ur8-8mb_26.7570_04.82

    • Eigenschaft svn:mergeinfo gelöscht
  • branches/freetz-stable-1.1/make/modcgi/modcgi.mk

    r4301 r5676  
    1 $(call PKG_INIT_BIN, 0.2) 
     1$(call PKG_INIT_BIN, 0.3) 
    22$(PKG)_SOURCE:=modcgi-$($(PKG)_VERSION).tar.bz2 
     3$(PKG)_SOURCE_MD5:=5323ce1a98492bd78d2fbe097268fe83 
    34$(PKG)_SITE:=http://freetz.magenbrot.net 
    45$(PKG)_BINARY:=$($(PKG)_DIR)/$(pkg) 
  • branches/freetz-stable-1.1/patches/cond/450-autorun-run_mount_7240_preview.patch

    r5210 r5676  
    1 --- etc/hotplug/run_mount.orig  2010-06-27 14:46:36.312098889 +0200 
    2 +++ etc/hotplug/run_mount   2010-06-27 14:46:36.622102537 +0200 
    3 @@ -133,6 +133,10 @@ 
     1--- etc/hotplug/run_mount.orig  2010-08-10 11:03:55.509776225 +0200 
     2+++ etc/hotplug/run_mount   2010-08-10 11:03:55.829739731 +0200 
     3@@ -136,6 +136,10 @@ 
    44 /etc/ftpd_control reconfig 
    55 fi 
  • branches/freetz-stable-1.1/patches/cond/450-autorun-run_mount_7270_preview.patch

    r5210 r5676  
    1 --- etc/hotplug/run_mount.orig  2010-06-27 14:38:58.472098971 +0200 
    2 +++ etc/hotplug/run_mount   2010-06-27 14:38:58.869629243 +0200 
    3 @@ -133,6 +133,10 @@ 
     1--- etc/hotplug/run_mount.orig  2010-08-10 11:03:02.059740258 +0200 
     2+++ etc/hotplug/run_mount   2010-08-10 11:03:02.479742241 +0200 
     3@@ -136,6 +136,10 @@ 
    44 /etc/ftpd_control reconfig 
    55 fi 
  • branches/freetz-stable-1.1/patches/cond/450-autorun-run_mount_7270_v3_preview.patch

    r5210 r5676  
    1 --- etc/hotplug/run_mount.orig  2010-06-27 14:43:14.572104352 +0200 
    2 +++ etc/hotplug/run_mount   2010-06-27 14:43:14.902103133 +0200 
    3 @@ -133,6 +133,10 @@ 
     1--- etc/hotplug/run_mount.orig  2010-08-10 11:03:31.352239867 +0200 
     2+++ etc/hotplug/run_mount   2010-08-10 11:03:31.742239715 +0200 
     3@@ -136,6 +136,10 @@ 
    44 /etc/ftpd_control reconfig 
    55 fi 
  • branches/freetz-stable-1.1/patches/cond/480-alarmclock_7270_preview.patch

    r5403 r5676  
    1 --- usr/www/all/html/de/home/home.html.orig 2010-08-02 17:06:19.000000000 +0200 
    2 +++ usr/www/all/html/de/home/home.html  2010-08-03 22:37:32.774872556 +0200 
    3 @@ -180,6 +180,11 @@ 
     1--- usr/www/all/html/de/home/home.html.orig 2010-08-18 16:35:00.387413334 +0200 
     2+++ usr/www/all/html/de/home/home.html  2010-08-18 16:35:00.757414391 +0200 
     3@@ -171,6 +171,11 @@ 
    44 <td class="tdLed">&nbsp;</td> 
    55 <td><script type="text/javascript">document.write(WeckerDisplay(2));</script></td> 
     
    1313 </div></div></div></div></div></div> 
    1414 <? include ../html/de/home/rbb_refresh.html ?> 
    15 --- usr/www/all/html/de/home/home.js.orig   2010-08-03 22:37:31.627356045 +0200 
    16 +++ usr/www/all/html/de/home/home.js    2010-08-03 22:37:32.774872556 +0200 
     15--- usr/www/all/html/de/home/home.js.orig   2010-08-18 16:34:55.438664152 +0200 
     16+++ usr/www/all/html/de/home/home.js    2010-08-18 16:35:00.767418123 +0200 
    1717@@ -224,6 +224,7 @@ 
    1818 var NachtEnabled = "<? query box:settings/night_time_control_enabled ?>"; 
     
    4040 jslDisplay("trIntFax", g_intFaxActive == "1"); 
    4141 jslDisplay("trSperre",RufsperreAktiv == true); 
    42 @@ -1416,8 +1418,10 @@ 
     42@@ -1413,8 +1415,10 @@ 
    4343 } 
    4444 return DisplayString; 
     
    5151 var Active = "<? query telcfg:settings/AlarmClock<? echo $var:wnr ?>/Active ?>"; 
    5252 var Time = "<? query telcfg:settings/AlarmClock<? echo $var:wnr ?>/Time ?>"; 
    53 @@ -1427,13 +1431,29 @@ 
     53@@ -1424,13 +1428,29 @@ 
    5454 { 
    5555 return WeckerString(Active,Time,Num,Weekdays); 
     
    8181 function PortfwDisplay(){ 
    8282 var infotext=""; 
    83 @@ -1652,6 +1672,8 @@ 
     83@@ -1649,6 +1669,8 @@ 
    8484 jslSetValue("uiPostWeckernr",0);break; 
    8585 case 1: 
     
    9090 jslGoTo('fon','wecker'); 
    9191 } 
    92 --- usr/www/all/html/de/fon/wecker.html.orig    2010-08-02 17:06:42.000000000 +0200 
    93 +++ usr/www/all/html/de/fon/wecker.html 2010-08-03 22:37:32.774872556 +0200 
     92--- usr/www/all/html/de/fon/wecker.html.orig    2010-08-18 16:34:53.398661899 +0200 
     93+++ usr/www/all/html/de/fon/wecker.html 2010-08-18 16:35:00.767418123 +0200 
    9494@@ -3,14 +3,25 @@ 
    9595 {?txtWakeupCall?} 
     
    118118 <p class="mb10">{?388:3268?}</p> 
    119119 <p class="mb10">{?388:2396?}</p> 
    120 --- usr/www/all/html/de/fon/wecker.js.orig  2010-08-02 17:05:54.000000000 +0200 
    121 +++ usr/www/all/html/de/fon/wecker.js   2010-08-03 22:37:32.774872556 +0200 
     120--- usr/www/all/html/de/fon/wecker.js.orig  2010-08-18 16:34:55.108668944 +0200 
     121+++ usr/www/all/html/de/fon/wecker.js   2010-08-18 16:35:00.767418123 +0200 
    122122@@ -23,8 +23,9 @@ 
    123123 var mCount = "<? query telcfg:settings/Foncontrol ?>"; 
  • branches/freetz-stable-1.1/patches/cond/de/remove_assistant_7240_preview.patch

    r5403 r5676  
    1 --- usr/www/all/templates/menu_page_head.html.orig  2010-08-03 22:37:32.234860557 +0200 
    2 +++ usr/www/all/templates/menu_page_head.html   2010-08-03 22:37:32.634895970 +0200 
     1--- usr/www/all/templates/menu_page_head.html.orig  2010-08-18 16:34:52.588663952 +0200 
     2+++ usr/www/all/templates/menu_page_head.html   2010-08-18 16:34:53.308664583 +0200 
    33@@ -61,24 +61,6 @@ 
    44 </div> 
     
    2626 if box.glob.script=="/home/home.lua" then 
    2727 box.out("<div style=\"position:relative;top:-21px\">") 
    28 --- usr/www/all/html/de/menus/menu2.html.orig   2010-08-03 22:37:32.544860158 +0200 
    29 +++ usr/www/all/html/de/menus/menu2.html    2010-08-03 22:37:32.634895970 +0200 
    30 @@ -160,35 +160,6 @@ 
     28--- usr/www/all/html/de/menus/menu2.html.orig   2010-08-18 16:34:53.198671198 +0200 
     29+++ usr/www/all/html/de/menus/menu2.html    2010-08-18 16:34:53.308664583 +0200 
     30@@ -163,35 +163,6 @@ 
    3131 </div> 
    3232 </div> 
  • branches/freetz-stable-1.1/patches/cond/de/remove_assistant_7270_preview.patch

    r5403 r5676  
    1 --- usr/www/all/templates/menu_page_head.html.orig  2010-08-03 22:36:29.344871887 +0200 
    2 +++ usr/www/all/templates/menu_page_head.html   2010-08-03 22:36:29.754876439 +0200 
     1--- usr/www/all/templates/menu_page_head.html.orig  2010-08-18 16:30:07.689914601 +0200 
     2+++ usr/www/all/templates/menu_page_head.html   2010-08-18 16:30:08.439915982 +0200 
    33@@ -61,24 +61,6 @@ 
    44 </div> 
     
    2626 if box.glob.script=="/home/home.lua" then 
    2727 box.out("<div style=\"position:relative;top:-21px\">") 
    28 --- usr/www/all/html/de/menus/menu2.html.orig   2010-08-03 22:36:29.694861062 +0200 
    29 +++ usr/www/all/html/de/menus/menu2.html    2010-08-03 22:36:29.754876439 +0200 
    30 @@ -160,35 +160,6 @@ 
     28--- usr/www/all/html/de/menus/menu2.html.orig   2010-08-18 16:30:08.309925512 +0200 
     29+++ usr/www/all/html/de/menus/menu2.html    2010-08-18 16:30:08.439915982 +0200 
     30@@ -163,35 +163,6 @@ 
    3131 </div> 
    3232 </div> 
  • branches/freetz-stable-1.1/patches/cond/de/remove_assistant_7270_v3_preview.patch

    r5403 r5676  
    1 --- usr/www/all/templates/menu_page_head.html.orig  2010-08-03 22:37:07.787392723 +0200 
    2 +++ usr/www/all/templates/menu_page_head.html   2010-08-03 22:37:08.244861828 +0200 
     1--- usr/www/all/templates/menu_page_head.html.orig  2010-08-18 16:34:20.677414160 +0200 
     2+++ usr/www/all/templates/menu_page_head.html   2010-08-18 16:34:21.277455882 +0200 
    33@@ -61,24 +61,6 @@ 
    44 </div> 
     
    2626 if box.glob.script=="/home/home.lua" then 
    2727 box.out("<div style=\"position:relative;top:-21px\">") 
    28 --- usr/www/all/html/de/menus/menu2.html.orig   2010-08-03 22:37:08.134858884 +0200 
    29 +++ usr/www/all/html/de/menus/menu2.html    2010-08-03 22:37:08.244861828 +0200 
    30 @@ -160,35 +160,6 @@ 
     28--- usr/www/all/html/de/menus/menu2.html.orig   2010-08-18 16:34:21.137413243 +0200 
     29+++ usr/www/all/html/de/menus/menu2.html    2010-08-18 16:34:21.277455882 +0200 
     30@@ -163,35 +163,6 @@ 
    3131 </div> 
    3232 </div> 
  • branches/freetz-stable-1.1/toolchain/make/target/uclibc/uclibc.mk

    r4718 r5676  
    33UCLIBC_MAKE_DIR:=$(TOOLCHAIN_DIR)/make/target/uclibc 
    44UCLIBC_SOURCE:=uClibc-$(UCLIBC_VERSION).tar.bz2 
    5 UCLIBC_SOURCE_SITE:=http://www.uclibc.org/downloads 
    6 UCLIBC_SOURCE_SITE2:=http://www.uclibc.org/downloads/old-releases  
     5UCLIBC_SOURCE_SITE:=http://www.uclibc.org/downloads/old-releases 
    76 
    87UCLIBC_KERNEL_SOURCE_DIR:=$(KERNEL_SOURCE_DIR) 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.