Error 2 bei svn r2877

[Herr des Lichts]

Moin moin,

folgendes Problem. Beim Versuch ein Image mit der aktuellen Laborversion 12606 und aktiviertem "Patch Extended DSL-Settings" bleibt das Komplieren mit folgendem Fehler hängen. Deaktiviere ich diese Option, lauft alles durch.

applying USB storage patch
applying patch file ./patches/cond/usbstorage_7270_labor_dsl.patch
patching file etc/hotplug/run_mount
----------------------------------------------------------------------
applying patch file ./patches/200-vcc.sh
applying patch file ./patches/210-ata.sh
applying patch file ./patches/210-enum.sh
applying patch file ./patches/210-international.sh
applying patch file ./patches/220-assistant.sh
applying patch file ./patches/220-cdrom-iso.sh
applying patch file ./patches/220-help.sh
applying patch file ./patches/230-openssl.sh
applying patch file ./patches/240-add-dsl-expert-pages.sh
adding dsl expert pages
patching build/modified/filesystem/usr/www/avm/html/de/internet/adsl.html
patching build/modified/filesystem/usr/www/avm/html/de/internet/bits.html
patching build/modified/filesystem/usr/www/avm/html/de/internet/atm.html
patching build/modified/filesystem/usr/www/avm/html/de/internet/overview.html
applying patch file ./patches/cond/de/dsl-expert-pages.patch
The next patch would create the file usr/www/avm/html/de/internet/labor_dsl.frm,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file usr/www/avm/html/de/internet/labor_dsl.frm.rej
The next patch would create the file usr/www/avm/html/de/internet/labor_dsl.html,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file usr/www/avm/html/de/internet/labor_dsl.html.rej
The next patch would create the file usr/www/avm/html/de/internet/labor_dsl.js,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file usr/www/avm/html/de/internet/labor_dsl.js.rej
----------------------------------------------------------------------
ERROR: modpatch: Error in patch-file ./patches/cond/de/dsl-expert-pages.patch
make: *** [firmware-nocompile] Error 2


Fritz!box 7270 und svn r2877

Cu

Achim

 

[matze1985]

Ist die 54.04.99-12606 nciht die aktuelle DSL-Labor, warum willst du da die extend-DSL-Page reinpatchen, denn dort ist die Seite doch her, wenn ich mich richtig erinnere.

Der Patch sollte aber für die DSL-labor nicht auswählbar sein.

config FREETZ_PATCH_DSL_EXPERT
	        bool "Patch extended DSL-Settings"
	        depends on \
	                FREETZ_TYPE_LABOR_ALL || \
	                FREETZ_TYPE_FON_WLAN_7270
	        default n
	        help
	                Patches the extended dsl-settings from labor-dsl into all-in-one-firmwares.

 

[olistudent]

Hm, da hab ich beim Update auf .67 wohl nicht mitgedacht...

MfG Oliver

edit:

Index: Config.in
===================================================================
--- Config.in (Revision 2878)
+++ Config.in (Arbeitskopie)
@@ -1013,8 +1013,8 @@
config FREETZ_PATCH_DSL_EXPERT
bool "Patch extended DSL-Settings"
depends on \
- FREETZ_TYPE_LABOR_ALL || \
- FREETZ_TYPE_FON_WLAN_7270
+ ! FREETZ_TYPE_LABOR_DSL && \
+ (FREETZ_TYPE_FON_WLAN_7170 || FREETZ_TYPE_FON_WLAN_7270)
default n
help
Patches the extended dsl-settings from labor-dsl into all-in-one-firmwares.

So würde das wohl mehr Sinn machen.

 

[matze1985]

Das stimmt so macht das mehr Sinn