also ich habe jetzt make dirclean gemacht, dann svn up, dann make.
resultat:
gruß floders
OT: muss man eigentlich vor jedem svn up das dirclean machen ?
resultat:
Code:
STEP 1: UNPACK
unpacking firmware image
splitting kernel image
unpacking filesystem image
created 3210 files
created 157 directories
created 289 symlinks
created 157 devices
created 0 fifos
unpacking var.tar
done.
STEP 2: MODIFY
applying patches
applying patches (7170_labor_all-de)
applying patch file ./patches/7170_labor_all/100-webif.sh
Applying symlinks, deleting additional webinterfaces
applying patch file ./patches/7170_labor_all/110-inittab.sh
applying patch file ./patches/100-profile.patch
patching file etc/profile
----------------------------------------------------------------------
applying patch file ./patches/110-multid-wait.patch
patching file etc/init.d/rc.net
----------------------------------------------------------------------
applying patch file ./patches/110-system_status.patch
patching file usr/bin/system_status
----------------------------------------------------------------------
applying patch file ./patches/120-inittab_console.patch
patching file etc/inittab
----------------------------------------------------------------------
applying patch file ./patches/130-fstab.patch
patching file etc/fstab
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/100-rc.net-dnsmasq.patch
patching file etc/init.d/rc.net
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/110-rc.S-mknod.patch
patching file etc/init.d/rc.S
Hunk #1 succeeded at 841 (offset -7 lines).
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/120-rc.S-dev.patch
patching file etc/init.d/rc.S
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/130-rc.S-logging.patch
patching file etc/init.d/rc.S
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/140-rc.S-no_avm_exit.patch
patching file etc/init.d/rc.S
Hunk #1 succeeded at 1349 (offset -28 lines).
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/290-replace_websrv-remove_igdd.patch
patching file etc/init.d/rc.net
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/301-remove_smbd.patch
patching file etc/init.d/rc.net
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/400_remove_ftpd.patch
patching file etc/hotplug/storage
Hunk #1 succeeded at 11 (offset -1 lines).
Hunk #2 succeeded at 142 (offset -1 lines).
Hunk #3 succeeded at 159 (offset -1 lines).
patching file etc/hotplug/run_mount
Hunk #1 succeeded at 14 (offset -1 lines).
Hunk #2 succeeded at 83 (offset -1 lines).
Hunk #3 succeeded at 103 (offset -1 lines).
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/de/130-foncalls.patch
patching file usr/www/all/html/de/home/foncalls.js
Hunk #1 succeeded at 219 (offset -1 lines).
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/de/190-webmenu.patch
patching file usr/www/all/html/de/menus/menu2_homehome.html
patching file usr/www/all/html/de/menus/menu2_konfig.html
----------------------------------------------------------------------
applying patch file ./patches/7170_labor_all/de/200-sperre1.patch
patching file usr/www/avm/html/de/fon/sperre1.js
Hunk #1 FAILED at 69.
Hunk #2 succeeded at 150 (offset -12 lines).
1 out of 2 hunks FAILED -- saving rejects to file usr/www/avm/html/de/fon/sperre1.js.rej
----------------------------------------------------------------------
ERROR: modpatch: Error in patch-file ./patches/7170_labor_all/de/200-sperre1.patch
make: *** [firmware-nocompile] Fehler 2
slightly@StinkyLinux:~/freetz-trunk$
gruß floders
OT: muss man eigentlich vor jedem svn up das dirclean machen ?