BjC6pwKY

1diff -r WNDR4300v2-basecompare/Config.in WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/Config.in
212a13,23
3> menu "Flash Type"
4> 	choice
5> 		prompt "Flash Type Selection"
6> 		config NAND_FLASH
7> 			bool "NAND flash"
8> 		
9> 		config NOR_FLASH
10> 			bool "NOR flash"
11> 	endchoice
12> endmenu
13> 
1446,48d56
15< 
16< 		config TARGET_INITRAMFS_COMPRESSION_LZO
17< 			bool "LZO"
18127a136,142
19> config CLEAN_TOOLCHAIN_CACHE
20> 	bool
21> 	prompt "Enable Delete all temporary toolchain files in build_dir"
22> 	default y
23> 	help
24> 		 This removes all tmporary toolchain data from the build_dir	
25> 
26335d349
27< source "target/toolchain/Config.in"
28338a353,823
29> menu "DNI common configuration"
30> menu "Interface names"
31> 	config WAN_PHYNAME_ENABLE
32> 		bool "Select to configure WAN Physical Interface"
33> 		default y
34> 		help
35> 			"If you want to configure WAN Physical Interface, you should select it."
36> 	
37> 	menu "WAN Physical Interface Configuration"
38> 	depends on WAN_PHYNAME_ENABLE
39> 		config WAN_PHYNAME
40> 			string
41> 			prompt "WAN Physical Interface"
42> 			default "eth1"
43> 			help
44> 				"WAN Physical Interface"
45> 	endmenu
46> 
47> 	config LAN_PHYNAME_ENABLE
48> 		bool "Select to configure LAN Physical Interface"
49> 		default y
50> 		help
51> 			"If you want to configure LAN Physical Interface, you should select it."
52> 
53> 	menu "LAN Physical Interface Configuration"
54> 	depends on LAN_PHYNAME_ENABLE
55> 		config LAN_PHYNAME
56> 			string
57> 			prompt "LAN Physical Interface"
58> 			default "eth0"
59> 			help
60> 				"LAN Physical Interface"
61> 	endmenu
62> 	
63> 	config WLAN_NG_PHYNAME_ENABLE
64> 		bool "Select to configure WLAN NG Physical Interface"
65> 		default y
66> 		help
67> 			"If you want to configure WLAN NG Physical Interface, you should select it."
68> 
69> 	menu "WLAN NG Physical Interface Configuration"
70> 	depends on WLAN_NG_PHYNAME_ENABLE
71> 		config WLAN_NG_PHYNAME
72> 			string
73> 			prompt "WLAN NG Physical Interface"
74> 			default "wifi0"
75> 			help
76> 				"WLAN NG Physical Interface"
77> 	endmenu
78> 
79> 	config WLAN_A_PHYNAME_ENABLE
80> 		bool "Select to configure WLAN A Physical Interface"
81> 		default y
82> 		help
83> 			"If you want to configure WLAN A Physical Interface, you should select it."
84> 
85> 	menu "WLAN A Physical Interface Configuration"
86> 	depends on WLAN_A_PHYNAME_ENABLE
87> 		config WLAN_A_PHYNAME
88> 			string
89> 			prompt "WLAN A band Physical Interface"
90> 			default "wifi1"
91> 			help
92> 				"WLAN A band Physical Interface"
93> 	endmenu
94> 
95> 	config WAN_IFNAME_ENABLE
96> 		bool "Select to configure WAN Interface"
97> 		default y
98> 		help
99> 			"If you want to configure WAN Interface, you should select it."
100> 
101> 	menu "WAN Interface Configuration"
102> 	depends on WAN_IFNAME_ENABLE
103> 		config WAN_IFNAME
104> 			string
105> 			prompt "WAN interface name"
106> 			default "eth1"
107> 			help
108> 				"WAN interface name"
109> 	endmenu
110> 
111> 	config LAN_IFNAME_ENABLE
112> 		bool "Select to configure LAN Interface"
113> 		default y
114> 		help
115> 			"If you want to configure LAN Interface, you should select it."
116> 
117> 	menu "LAN Interface Configuration"
118> 	depends on LAN_IFNAME_ENABLE
119> 		config LAN_IFNAME
120> 			string
121> 			prompt "LAN interface name"
122> 			default "eth0"
123> 			help
124> 				"LAN interface name"
125> 	endmenu
126> 
127> 	config WLAN_NG_IFNAME_ENABLE
128> 		bool "Select to configure WLAN NG Interface"
129> 		default y
130> 		help
131> 			"If you want to configure WLAN NG Interface, you should select it."
132> 
133> 	menu "WLAN NG Interface Configuration"
134> 	depends on WLAN_NG_IFNAME_ENABLE
135> 		config WLAN_NG_IFNAME
136> 			string
137> 			prompt "WLAN 11ng interface name"
138> 			default "ath0"
139> 			help
140> 				"WLAN 11ng interface name"
141> 	endmenu
142> 	
143> 	config WLAN_A_IFNAME_ENABLE
144> 		bool "Select to configure WLAN A Interface"
145> 		default y
146> 		help
147> 			"If you want to configure WLAN A Interface, you should select it."
148> 
149> 	menu "WLAN A Interface Configuration"
150> 	depends on WLAN_A_IFNAME_ENABLE
151> 		config WLAN_A_IFNAME
152> 			string
153> 			prompt "WLAN 11na/ac interface name"
154> 			default "ath1"
155> 			help
156> 				"WLAN 11na/ac interface name"
157> 	endmenu
158> 
159> 	config WLAN_IFNAME_2_ENABLE
160> 		bool "Select to configure 2nd WLAN 11na/ac/ng Interface"
161> 		default y
162> 		help
163> 			"If you want to configure 2nd WLAN 11na/ac/ng Interface, you should select it."
164> 
165> 	menu "The 2nd WLAN Interface Configuration"
166> 	depends on WLAN_IFNAME_2_ENABLE
167> 		config WLAN_IFNAME_2
168> 			string
169> 			prompt "The 2nd WLAN 11na/ac/ng interface name"
170> 			default "ath2"
171> 			help
172> 				"The 2nd WLAN 11na/ac/ng interface name"
173> 	endmenu
174> 
175> 	config WLAN_IFNAME_3_ENABLE
176> 		bool "Select to configure 3rd WLAN 11na/ac/ng Interface"
177> 		default y
178> 		help
179> 			"If you want to configure 3rd WLAN 11na/ac/ng Interface, you should select it."
180> 
181> 	menu "The 3nd WLAN Interface Configuration"
182> 	depends on WLAN_IFNAME_3_ENABLE
183> 		config WLAN_IFNAME_3
184> 			string
185> 			prompt "The 3rd WLAN 11na/ac/ng interface name"
186> 			default "ath3"
187> 			help
188> 				"The 3rd WLAN 11na/ac/ng interface name"
189> 	endmenu
190> 	
191> 	config BRIDGE_IFNAME_ENABLE
192> 		bool "Select to configure Bridge Interface"
193> 		default y
194> 		help
195> 			"If you want to configure Bridge Interface, you should select it."
196> 
197> 	menu "The Bridge Interface Configuration"
198> 	depends on BRIDGE_IFNAME_ENABLE
199> 		config BRIDGE_IFNAME
200> 			string
201> 			prompt "Bridge interface name"
202> 			default "br0"
203> 			help
204> 				"Bridge interface name"
205> 	endmenu
206> 
207> 	config IPTV_BRIDGE_IFNAME_ENABLE
208> 		bool "Select to configure IPTV Bridge Interface"
209> 		default y
210> 		help
211> 			"If you want to configure IPTV Bridge Interface, you should select it."
212> 
213> 	menu "The IPTV Bridge Interface Configuration"
214> 	depends on IPTV_BRIDGE_IFNAME_ENABLE
215> 		config IPTV_BRIDGE_IFNAME
216> 			string
217> 			prompt "IPTV Bridge interface name"
218> 			default "br1"
219> 			help
220> 				"IPTV Bridge interface name"
221> 	endmenu
222> 
223> 	config PPP_IFNAME_ENABLE
224> 		bool "Select to configure PPP Interface"
225> 		default y
226> 		help
227> 			"If you want to configure PPP Interface, you should select it."
228> 
229> 	menu "The PPP Interface Configuration"
230> 	depends on PPP_IFNAME_ENABLE
231> 		config PPP_IFNAME
232> 			string
233> 			prompt "PPP interface name"
234> 			default "ppp0"
235> 			help
236> 				"PPP interface name"
237> 	endmenu
238> 
239> 	config MULTI_PPP_IFNAME_ENABLE
240> 		bool "Select to configure MULTI PPP Interface"
241> 		default y
242> 		help
243> 			"If you want to configure MULTI PPP Interface, you should select it."
244> 
245> 	menu "The MULTI PPP Interface Configuration"
246> 	depends on MULTI_PPP_IFNAME_ENABLE
247> 		config MULTI_PPP_IFNAME
248> 			string
249> 			prompt "Multi PPP interface name"
250> 			default "ppp1"
251> 			help
252> 				"Multi PPP interface name"
253> 	endmenu
254> 
255> 	config IPV6_PPPOE_IFNAME_ENABLE
256> 		bool "Select to configure IPv6 PPPoE Interface"
257> 		default y
258> 		help
259> 			"If you want to configure IPv6 PPPoE Interface, you should select it."
260> 
261> 	menu "The IPv6 PPPoE Interface Configuration"
262> 	depends on IPV6_PPPOE_IFNAME_ENABLE
263> 		config IPV6_PPPOE_IFNAME
264> 			string
265> 			prompt "IPv6 PPPoE interface name"
266> 			default "ppp2"
267> 			help
268> 				"IPv6 PPPoE interface name"
269> 	endmenu
270> 
271> 	config IPV6_L2TP_IFNAME_ENABLE
272> 		bool "Select to configure IPv6 L2TP Interface"
273> 		default y
274> 		help
275> 			"If you want to configure IPv6 L2TP Interface, you should select it."
276> 
277> 	menu "The IPv6 L2TP Interface Configuration"
278> 	depends on IPV6_L2TP_IFNAME_ENABLE
279> 		config IPV6_L2TP_IFNAME
280> 			string
281> 			prompt "IPv6 L2TP interface name"
282> 			default "ppp3"
283> 			help
284> 				"IPv6 L2TP interface name"
285> 	endmenu
286> 	
287> 	config IPV6_6TO4_IFNAME_ENABLE
288> 		bool "Select to configure IPv6 6to4 Interface"
289> 		default y
290> 		help
291> 			"If you want to configure IPv6 6to4 Interface, you should select it."
292> 
293> 	menu "The IPv6 6to4 Interface Configuration"
294> 	depends on IPV6_6TO4_IFNAME_ENABLE
295> 		config IPV6_6TO4_IFNAME
296> 			string
297> 			prompt "IPv6 6to4 interface name"
298> 			default "sit1"
299> 			help
300> 				"IPv6 6to4 interface name"
301> 	endmenu
302> endmenu
303> menu "MTD partitions"
304> 	config BOOTLOADER_PARTITION_ENABLE
305> 		bool "Select to configure bootloader partition"
306> 		default y
307> 		help
308> 			"If you want to configure bootloader partition, you should select it."
309> 
310> 	menu "The configuration of bootloader partition"
311> 	depends on BOOTLOADER_PARTITION_ENABLE
312> 		config BOOTLOADER_PARTITION
313> 			string
314> 			prompt "Bootloader's partition"
315> 			default "/dev/mtd0"
316> 	endmenu
317> 
318> 	config BOOTLOADER_ENV_PARTITION_ENABLE
319> 		bool "Select to configure bootloader env partition"
320> 		default y
321> 		help
322> 			"If you want to configure bootloader env partition, you should select it."
323> 
324> 	menu "The configuration of bootloader env partition"
325> 	depends on BOOTLOADER_ENV_PARTITION_ENABLE
326> 		config BOOTLOADER_ENV_PARTITION
327> 			string
328> 			prompt "Bootloader ENV's partition"
329> 			default "/dev/mtd1"
330> 	endmenu
331> 
332> 	config CALDATA_PARTITION_ENABLE
333> 		bool "Select to configure caldata partition"
334> 		default y
335> 		help
336> 			"If you want to configure caldata partition, you should select it."
337> 
338> 	menu "The configuration of caldata partition"
339> 	depends on CALDATA_PARTITION_ENABLE
340> 		config CALDATA_PARTITION
341> 			string
342> 			prompt "Calibration Data's partition"
343> 			default "/dev/mtd2"
344> 	endmenu
345> 
346> 	config CALDATA_BACKUP_PARTITION_ENABLE
347> 		bool "Select to configure caldata_backup partition"
348> 		default y
349> 		help
350> 			"If you want to configure caldata backup partition, you should select it."
351> 
352> 	menu "The configuration of caldata_backup partition"
353> 	depends on CALDATA_BACKUP_PARTITION_ENABLE
354> 		config CALDATA_BACKUP_PARTITION
355> 			string
356> 			prompt "Calibration Data's back up partition"
357> 			default "/dev/mtd2"
358> 	endmenu
359> 
360> 	config POT_PARTITION_ENABLE
361> 		bool "Select to configure pot partition"
362> 		default y
363> 		help
364> 			"If you want to configure pot partition, you should select it."
365> 
366> 	menu "The configuration of pot partition"
367> 	depends on POT_PARTITION_ENABLE
368> 		config POT_PARTITION
369> 			string
370> 			prompt "POT's partition"
371> 			default "/dev/mtd3"
372> 	endmenu
373> 
374> 	config LANGUAGE_PARTITION_ENABLE
375> 		bool "Select to configure language partition"
376> 		default y
377> 		help
378> 			"If you want to configure language partition, you should select it."
379> 
380> 	menu "The configuration of language partition"
381> 	depends on LANGUAGE_PARTITION_ENABLE
382> 		config LANGUAGE_PARTITION
383> 			string
384> 			prompt "LANGUAGE TABLE's partition"
385> 			default "/dev/mtd4"
386>         endmenu
387> 	
388> 	config CONFIGURATION_PARTITION_ENABLE	
389> 		bool "Select to configure configuration partition"
390> 		default y
391> 		help
392> 			"If you want to configure configuration partition, you should select it."
393> 
394> 	menu "The configuration of configuration partition"
395> 	depends on CONFIGURATION_PARTITION_ENABLE
396> 		config CONFIGURATION_PARTITION
397> 			string
398> 			prompt "Configuration's partition"
399> 			default "/dev/mtd5"
400> 	endmenu
401> 
402> 	config TRAFFIC_METER_PARTITION_ENABLE
403> 		bool "Select to configure traffic meter partition"
404> 		default y
405> 		help
406> 			"If you want to configure configuration partition, you should select it."
407> 
408> 	menu "The configuration of traffic meter partition"
409> 	depends on TRAFFIC_METER_PARTITION_ENABLE
410> 		config TRAFFIC_METER_PARTITION
411> 			string
412> 			prompt "Traffic Meter's partition"
413> 			default "/dev/mtd6"
414> 	endmenu
415> 
416> 	config KERNEL_PARTITION_ENABLE
417> 		bool "Select to configure kernel partition"
418> 		default y
419> 		help
420> 			"If you want to configure kernel partition, you should select it."
421> 
422> 	menu "The configuration of kernel partition"
423> 	depends on KERNEL_PARTITION_ENABLE
424> 		config KERNEL_PARTITION
425> 			string
426> 			prompt "Kernel's partition"
427> 			default "/dev/mtd7"
428> 	endmenu
429> 
430> 	config ROOTFS_PARTITION_ENABLE
431> 		bool "Select to configure rootfs partition"
432> 		default y
433> 		help
434> 			"If you want to configure rootfs partition, you should select it."
435> 
436> 	menu "The configuration of rootfs partition"
437> 	depends on ROOTFS_PARTITION_ENABLE
438> 		config ROOTFS_PARTITION
439> 			string
440> 			prompt "Rootfs's partition"
441> 			default "/dev/mtd8"
442> 	endmenu
443> 
444> 	config ROOTFS_DATA_PARTITION_ENABLE
445> 		bool "Select to configure rootfs data partition"
446> 		default y
447> 		help
448> 			"If you want to configure rootfs data partition, you should select it."
449> 
450> 	menu "The configuration of rootfs data partition"
451> 	depends on ROOTFS_DATA_PARTITION_ENABLE
452> 		config ROOTFS_DATA_PARTITION
453> 			string
454> 			prompt "Rootfs data's partition"
455> 			default "/dev/mtd9"
456> 	endmenu
457> 
458> 	config FIRMWARE_PARTITION_ENABLE
459> 		bool "Select to configure firmware partition"
460> 		default y
461> 		help
462> 			"If you want to configure firmware partition, you should select it."
463> 
464> 	menu "The configuration of firmware partition"
465> 	depends on FIRMWARE_PARTITION_ENABLE
466> 		config FIRMWARE_PARTITION
467> 			string
468> 			prompt "Firmware's partition"
469> 			default "/dev/mtd10"
470> 	endmenu
471> 
472> 	config RESERVED_PARTITION_ENABLE
473> 		bool "Select to configure reserved partition"
474> 		default y
475> 		help
476> 			"If you want to configure reserved partition, you should select it."
477> 
478> 	menu "The configuration of reserved partition"
479> 	depends on RESERVED_PARTITION_ENABLE
480> 		config RESERVED_PARTITION
481> 			string
482> 			prompt "Reserved partition"
483> 			default "/dev/mtd11"
484> 	endmenu
485> 
486> 	config NVRAM_PARTITION_ENABLE
487> 		bool "Select to configure nvram partition"
488> 		default y
489> 		help
490> 			"If you want to configure nvram partition partition, you should select it."
491> 
492> 	menu "The configuration of nvram partition"
493> 	depends on NVRAM_PARTITION_ENABLE
494> 		config NVRAM_PARTITION
495> 			string
496> 			prompt "NVRAM partition"
497> 			default "/dev/mtd11"
498> 	endmenu
499> endmenu
500339a825,831
501> config TARGET_BOARD_HW_ID
502> 	string
503> 	prompt "DUT's board hw ID"
504> 	default "2976436100+128+128"
505> 	help
506> 		"PCB Board Number + Flash Size + RAM Size"
507> endmenu
508Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src: configs
509Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src: dl
510Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: AP71
511Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: developer-guide.sgml
512Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: git-developer-guide.sgml
513Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: README.wndr3700u
514Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: SubmittingPatches
515Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: tiny-router
516Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: wndr3700_release_notes.tex
517Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/docs: wnr1000v2_release_notes.tex
518Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src: git_home
519Seulement dans WNDR4300v2-basecompare: .gitignore
520diff -r WNDR4300v2-basecompare/include/download.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/download.mk
521142c142,149
522< 	$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown))
523---
524> 	case $(FILE) in \
525> 		linux-2.[46]*.tar.bz2) \
526> 			if [ "x$(LINUX_TREEISH)" = "x" ]; then $(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown)); else touch $(DL_DIR)/$(FILE); fi; \
527> 		;; \
528> 		*) \
529> 			$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown)); \
530> 		;; \
531> 	esac
532diff -r WNDR4300v2-basecompare/include/image.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/image.mk
53326c26
534< ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),)
535---
536> ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),)
53734c34
538< SQUASHFS_OPTS  := -comp lzma -processors 1
539---
540> SQUASHFS_OPTS  := -lzma -processors 1
54143c43,44
542< # pad to 4k, 8k, 64k, 128k and add jffs2 end-of-filesystem mark
543---
544> # pad to 64k and add jffs2 end-of-filesystem mark
545> # do this twice to make sure that this works with 128k blocksize as well
54645,47c46
547< 	dd if=$(1) of=$(KDIR)/tmpfile.0 bs=4k conv=sync
548< 	$(call add_jffs2_mark,$(KDIR)/tmpfile.0)
549< 	dd if=$(KDIR)/tmpfile.0 of=$(KDIR)/tmpfile.1 bs=4k conv=sync
550---
551> 	dd if=$(1) of=$(KDIR)/tmpfile.1 bs=64k conv=sync
55249,51c48
553< 	dd if=$(KDIR)/tmpfile.1 of=$(KDIR)/tmpfile.2 bs=64k conv=sync
554< 	$(call add_jffs2_mark,$(KDIR)/tmpfile.2)
555< 	dd if=$(KDIR)/tmpfile.2 of=$(1) bs=64k conv=sync
556---
557> 	dd of=$(1) if=$(KDIR)/tmpfile.1 bs=64k conv=sync
55853d49
559< 	rm -f $(KDIR)/tmpfile.*
560diff -r WNDR4300v2-basecompare/include/kernel-build.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/kernel-build.mk
561107,108c107,181
562< 	$(SCRIPT_DIR)/kconfig.pl '>' $(if $(LINUX_SUBCONFIG),'+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG),$(GENERIC_LINUX_CONFIG)) \
563< 		$(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
564---
565> 	$(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
566> 	$(Kernel/Configure)
567> 
568>   install: $(LINUX_DIR)/.image
569> 	+$(MAKE) -C image compile install TARGET_BUILD=
570> 
571>   clean: FORCE
572> 	rm -rf $(KERNEL_BUILD_DIR)
573> 
574>   image-prereq:
575> 	@+$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=
576> 
577>   prereq: image-prereq
578> 
579> endef
580> 
581> define BuildGitKernel
582>   $(if $(QUILT),$(Build/Quilt))
583>   $(STAMP_PREPARED):
584> 	-rm -rf $(KERNEL_BUILD_DIR)
585> 	-mkdir -p $(KERNEL_BUILD_DIR)
586> 	$(Kernel/Prepare)
587> 	touch $$@
588> 
589>   $(KERNEL_BUILD_DIR)/symtab.txt: FORCE
590> 	find $(LINUX_DIR) $(STAGING_DIR_ROOT)/lib/modules -name \*.ko | \
591> 		xargs $(TARGET_CROSS)nm | \
592> 		awk '$$$$1 == "U" { print $$$$2 } ' | \
593> 		sort -u > $$@
594> 
595>   $(KERNEL_BUILD_DIR)/symtab.h: $(KERNEL_BUILD_DIR)/symtab.txt
596> 	( \
597> 		echo '#define SYMTAB_KEEP \'; \
598> 		cat $(KERNEL_BUILD_DIR)/symtab.txt | \
599> 			awk '{print "*(__ksymtab." $$$$1 ") \\" }'; \
600> 		echo; \
601> 		echo '#define SYMTAB_KEEP_GPL \'; \
602> 		cat $(KERNEL_BUILD_DIR)/symtab.txt | \
603> 			awk '{print "*(__ksymtab_gpl." $$$$1 ") \\" }'; \
604> 		echo; \
605> 		echo '#define SYMTAB_KEEP_STR \'; \
606> 		cat $(KERNEL_BUILD_DIR)/symtab.txt | \
607> 			awk '{print "*(__ksymtab_strings." $$$$1 ") \\" }'; \
608> 		echo; \
609> 	) > $$@
610> 
611>   $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
612> 	$(Kernel/Configure)
613> 	touch $$@
614> 
615>   $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
616> 	$(Kernel/CompileModules)
617> 	touch $$@
618> 
619>   $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) $(if $(CONFIG_STRIP_KERNEL_EXPORTS),$(KERNEL_BUILD_DIR)/symtab.h) FORCE
620> 	$(Kernel/CompileImage)
621> 	touch $$@
622> 	
623>   mostlyclean: FORCE
624> 	$(Kernel/Clean)
625> 
626>   define BuildGitKernel
627>   endef
628> 
629>   download: $(DL_DIR)/$(LINUX_SOURCE)
630>   prepare: $(STAMP_CONFIGURED)
631>   compile: $(LINUX_DIR)/.modules
632> 	$(MAKE) -C image compile TARGET_BUILD=
633> 
634>   oldconfig menuconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE
635> 	[ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)"
636> 	$(LINUX_CONFCMD) > $(LINUX_DIR)/.config
637> 	touch $(LINUX_CONFIG)
638> 	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
639> 	$(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
640diff -r WNDR4300v2-basecompare/include/kernel-defaults.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/kernel-defaults.mk
64139a40
642> ifeq ($(LINUX_TREEISH),)
64343a45,55
644> endef
645> else
646> define Kernel/Prepare/Default
647> 	-mkdir -p $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
648> 	$(CP) $(GIT_HOME)/linux.git/* $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/
649> 	if [ -d $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/arch/i386 ]; then \
650> 	    mkdir -p $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/arch/x86; \
651> 	    ln -s $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/arch/i386/* $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/arch/x86/; \
652> 	    ln -s $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/include/asm-i386 $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/include/asm-x86; \
653> 	fi
654> 	$(Kernel/Patch)
65544a57
656> endif
65770,71c83
658< 		grep -v -e INITRAMFS -e CONFIG_RD_ -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
659< 		echo 'CONFIG_BLK_DEV_INITRD=y' >> $(LINUX_DIR)/.config
660---
661> 		grep -v -e INITRAMFS -e CONFIG_RD_ $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
66279d90
663< 		echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),CONFIG_INITRAMFS_COMPRESSION_LZO=y\nCONFIG_RD_LZO=y,# CONFIG_INITRAMFS_COMPRESSION_LZO is not set\n# CONFIG_RD_LZO is not set)" >> $(LINUX_DIR)/.config
66499,109c110,132
665< 	$(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target
666< 	echo "$(if $(CONFIG_KERNEL_KALLSYMS),CONFIG_KALLSYMS=y,# CONFIG_KALLSYMS is not set)" >> $(LINUX_DIR)/.config.target
667< 	echo "$(if $(CONFIG_KERNEL_PROFILING),CONFIG_PROFILING=y,# CONFIG_PROFILING is not set)" >> $(LINUX_DIR)/.config.target
668< 	echo "$(if $(CONFIG_KERNEL_DEBUG_FS),CONFIG_DEBUG_FS=y,# CONFIG_DEBUG_FS is not set)" >> $(LINUX_DIR)/.config.target
669< 	echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
670< 	echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
671< 	echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target
672< 	$(SED) 's,.*CONFIG_AEABI.*,$(if $(CONFIG_EABI_SUPPORT),CONFIG_AEABI=y,# CONFIG_AEABI is not set),' $(LINUX_DIR)/.config.target
673< 	$(if $(CONFIG_EABI_SUPPORT),echo '# CONFIG_OABI_COMPAT is not set' >> $(LINUX_DIR)/.config.target)
674< 	$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
675< 	$(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
676---
677> 	#rm -rf $(LINUX_DIR)-final
678> 	#$(CP) $(LINUX_DIR) $(LINUX_DIR)-final
679> 	case $(CUSTOMER) in \
680> 		dni) \
681> 			cat $(LINUX_CONFIG) > $(LINUX_DIR)/.config; \
682> 		;; \
683> 		netgear) \
684> 			cat $(LINUX_CONFIG) > $(LINUX_DIR)/.config; \
685> 		;; \
686> 		*) \
687> 	$(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target; \
688> 	echo "$(if $(CONFIG_KERNEL_KALLSYMS),CONFIG_KALLSYMS=y,# CONFIG_KALLSYMS is not set)" >> $(LINUX_DIR)/.config.target; \
689> 	echo "$(if $(CONFIG_KERNEL_PROFILING),CONFIG_PROFILING=y,# CONFIG_PROFILING is not set)" >> $(LINUX_DIR)/.config.target; \
690> 	echo "$(if $(CONFIG_KERNEL_DEBUG_FS),CONFIG_DEBUG_FS=y,# CONFIG_DEBUG_FS is not set)" >> $(LINUX_DIR)/.config.target; \
691> 	echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target; \
692> 	echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target; \
693> 	echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target; \
694> 	$(SED) 's,.*CONFIG_AEABI.*,$(if $(CONFIG_EABI_SUPPORT),CONFIG_AEABI=y,# CONFIG_AEABI is not set),' $(LINUX_DIR)/.config.target \
695> 	$(if $(CONFIG_EABI_SUPPORT),echo '# CONFIG_OABI_COMPAT is not set' >> $(LINUX_DIR)/.config.target); \
696> 	$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override; \
697> 	$(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config; \
698> 		;; \
699> 	esac
700117c140
701< 	+$(MAKE) $(KERNEL_MAKEOPTS) modules
702---
703> 	+$(MAKE) $(KERNEL_MAKEOPTS) V=1 modules
704124c147
705< 	+$(MAKE) $(KERNEL_MAKEOPTS) $(KERNELNAME)
706---
707> 	+$(MAKE) $(KERNEL_MAKEOPTS) V=1 $(KERNELNAME)
708diff -r WNDR4300v2-basecompare/include/kernel.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/kernel.mk
70924a25,29
710>   ifeq (,$(TARGET_KERNEL_CC))
711>     TARGET_KERNEL_CC:=$(TARGET_CC)
712>     TARGET_KERNEL_CROSS:=$(TARGET_CROSS)
713>   endif
714> 
71529,30c34,35
716<     KERNEL_CC?=$(TARGET_CC)
717<     KERNEL_CROSS?=$(TARGET_CROSS)
718---
719>     KERNEL_CC?=$(TARGET_KERNEL_CC)
720>     KERNEL_CROSS?=$(TARGET_KERNEL_CROSS)
721105c110
722<   $(eval $(call KernelPackage/$(1)/$(BOARD)))
723---
724>   $(eval $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL)))
725116c121
726<     $(call KernelPackage/$(1)/$(BOARD))
727---
728>     $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
729diff -r WNDR4300v2-basecompare/include/kernel-version.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/kernel-version.mk
73012a13,15
731> ifeq ($(LINUX_VERSION),2.6.15)
732>   LINUX_KERNEL_MD5SUM:=cdf95e00f5111e31f78e1d97304d9522
733> endif
734diff -r WNDR4300v2-basecompare/include/netfilter.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/netfilter.mk
73565a66,69
736> $(eval $(call nf_add,IPT_SNATP2P,CONFIG_IP_NF_TARGET_SNATP2P, $(P_V4)ipt_SNATP2P))
737> $(eval $(call nf_add,IPT_HAIRPIN,CONFIG_IP_NF_TARGET_HAIRPIN, $(P_V4)ipt_HAIRPIN))
738> $(eval $(call nf_add,IPT_DNATP2P,CONFIG_IP_NF_TARGET_DNATP2P, $(P_V4)ipt_DNATP2P))
739> $(eval $(call nf_add,IPT_LOG,CONFIG_IP_NF_MATCH_LOG, $(P_V4)ipt_log))
740321a326,329
741> IPT_BUILTIN += $(IPT_SNATP2P-y)
742> IPT_BUILTIN += $(IPT_HAIRPIN-y)
743> IPT_BUILTIN += $(IPT_DNATP2P-y)
744> IPT_BUILTIN += $(IPT_LOG-y)
745diff -r WNDR4300v2-basecompare/include/package-defaults.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/package-defaults.mk
74640d39
747<   VARIANT:=
748diff -r WNDR4300v2-basecompare/include/package-dumpinfo.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/package-dumpinfo.mk
74935,36c35
750< $(if $(VARIANT),Build-Variant: $(VARIANT)
751< )$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
752---
753> $(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
754diff -r WNDR4300v2-basecompare/include/package-ipkg.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/package-ipkg.mk
75539d38
756<     ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
75752d50
758<     endif
759diff -r WNDR4300v2-basecompare/include/package.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/package.mk
76020c20
761< STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
762---
763> STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(QUILT)$(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS)))
764diff -r WNDR4300v2-basecompare/include/prereq-build.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/prereq-build.mk
76517,19c17,19
766< $(eval $(call Require,non-root, \
767< 	Please do not compile as root. \
768< ))
769---
770> #$(eval $(call Require,non-root, \
771> #	Please do not compile as root. \
772> #))
773132,134c132,134
774< $(eval $(call RequireCommand,svn, \
775< 	Please install the subversion client. \
776< ))
777---
778> #$(eval $(call RequireCommand,svn, \
779> #	Please install the subversion client. \
780> #))
781diff -r WNDR4300v2-basecompare/include/quilt.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/quilt.mk
78227a28,74
783> define PatchGenericDir/Quilt
784> 	@if [ -s "$(2)/series" -a "$(3)" != "dni" ]; then \
785> 		mkdir -p "$(1)/patches/generic/"; \
786> 		cp "$(2)/series" "$(1)/patches/generic/"; \
787> 	fi
788> 	@for patch in $$$$( (cd "$(2)" && if [ -f series ]; then $(call filter_series,series); else ls; fi; ) 2>/dev/null ); do ( \
789> 		if [ "$(3)" = "dni" ]; then continue; fi; \
790> 		cp "$(2)/$$$$patch" "$(1)"; \
791> 		cd "$(1)"; \
792> 		$(QUILT_CMD) import -Pgeneric/$$$$patch -p 1 "$$$$patch"; \
793> 		$(QUILT_CMD) push -f >/dev/null 2>/dev/null; \
794> 		rm -f "$$$$patch"; \
795> 	); done
796> 	@echo generic/ >> "$(1)/patches/.subdirs"
797> endef
798> 
799> define PatchGenericDir/Default
800> 	if [ -d "$(2)" -a "$$$$(ls $(2) | wc -l)" -gt 0 -a "$(3)" != "dni" -a "$(3)" != "netgear" ]; then \
801> 		if [ -s "$(2)/series" ]; then \
802> 			$(call filter_series,$(2)/series) | xargs -n1 \
803> 				$(PATCH) "$(1)" "$(2)"; \
804> 		else \
805> 			$(PATCH) "$(1)" "$(2)"; \
806> 		fi; \
807> 	fi
808> endef
809> 
810> define Build/PatchEnabled/Default
811> 	@if [ "$(patches-y)" != "" ]; then \
812> 		for patch in $(patches-y); do \
813> 			if [ ! -f "$$$$patch" ]; then \
814> 				echo "Failed: $$$$patch does not exist"; exit 1; \
815> 			fi; \
816> 		done; \
817> 		TMP_PATCH_DIR=`mktemp -d -p ./ -t patches.XXXXXXXXXX`; \
818> 		$(CP) $(patches-y) $$$$TMP_PATCH_DIR; \
819> 		if ! $(PATCH) $(PKG_BUILD_DIR) $$$$TMP_PATCH_DIR; then \
820> 			rm -rf $$$$TMP_PATCH_DIR; exit 1; \
821> 		fi; \
822> 		rm -rf $$$$TMP_PATCH_DIR; \
823> 	fi
824> endef
825> 
826> define PatchGenericDir
827> $(call PatchGenericDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3)))
828> endef
829> 
83093,95c140,151
831< 	$(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/)
832< 	find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
833< 	$(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
834---
835> 	if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
836> 	case $(CUSTOMER) in \
837> 	    dni) \
838> 	    ;; \
839> 	    netgear) \
840> 	    ;; \
841> 	    *) \
842> 	    $(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/); \
843> 	    find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f; \
844> 	    ;; \
845> 	esac
846> 	$(call PatchGenericDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),$(CUSTOMER))
84796a153,154
848> 	#rm -rf $(LINUX_DIR)-final
849> 	#$(CP) $(LINUX_DIR) $(LINUX_DIR)-final
850diff -r WNDR4300v2-basecompare/include/scan.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/scan.mk
85137c37
852< 	$(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
853---
854> 	$(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Git|)(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
85565c65
856< 	-cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 2>/dev/null
857---
858> 	-cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat | grep -v -e 'Linux-Treeish: $$' | grep -v -e 'Netfilter-Treeish: $$' | grep -v -e 'Customer: $$' > $@ 2>/dev/null
859diff -r WNDR4300v2-basecompare/include/subdir.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/subdir.mk
86038,40c38
861<         $(foreach variant,$(if $(BUILD_VARIANT),$(BUILD_VARIANT),$(if $($(1)/$(bd)/variants),$($(1)/$(bd)/variants),__default)),
862< 			+$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) BUILD_VARIANT="$(filter-out __default,$(variant))" $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE,   ERROR: $(1)/$(bd) failed to build$(if $(filter-out __default,$(variant)), (build variant: $(variant))).))
863<         )
864---
865> 		+$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE,   ERROR: $(1)/$(bd) failed to build.))
866diff -r WNDR4300v2-basecompare/include/target.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/target.mk
867118c118
868< LINUX_SUBCONFIG?=$(if $(SHARED_LINUX_CONFIG),,$(firstword $(wildcard $(PLATFORM_SUBDIR)/config-$(KERNEL_PATCHVER) $(PLATFORM_SUBDIR)/config-default)))
869---
870> LINUX_SUBCONFIG?=$(firstword $(wildcard $(PLATFORM_SUBDIR)/config-$(KERNEL_PATCHVER) $(PLATFORM_SUBDIR)/config-default))
871131a132
872>   BuildGitTarget=$(BuildTargets/DumpCurrent)
873188a190,191
874> 	 echo 'Linux-Treeish: $(LINUX_TREEISH)'; \
875> 	 echo 'Netfilter-Treeish: $(NETFILTER_TREEISH)'; \
876189a193
877> 	 echo 'Customer: $(CUSTOMER)'; \
878201a206
879>   BuildGitTarget?=$(BuildGitKernel)
880diff -r WNDR4300v2-basecompare/include/toolchain-build.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/include/toolchain-build.mk
88110d9
882< REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
883Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: acl
884Seulement dans WNDR4300v2-basecompare/package: acx
885Seulement dans WNDR4300v2-basecompare/package: acx-mac80211
886Seulement dans WNDR4300v2-basecompare/package: admswconfig
887Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: amule
888Seulement dans WNDR4300v2-basecompare/package: apex
889Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ap-mode
890Seulement dans WNDR4300v2-basecompare/package: ar7-atm
891Seulement dans WNDR4300v2-basecompare/package: arptables
892Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: artmtd
893Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: atheros-aquila-madwifi
894Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: atheros-aquila-madwifi-11n-scripts
895Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: atheros-aquila-wpa2
896Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: atheros-enet
897Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: atheros-gpio
898Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: avahi
899Seulement dans WNDR4300v2-basecompare/package: avila-wdt
900Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files: dni-default
901Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/bin: login
902Seulement dans WNDR4300v2-basecompare/package/base-files/files/bin: login.sh
903diff -r WNDR4300v2-basecompare/package/base-files/files/etc/init.d/boot WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/init.d/boot
9046,42d5
905< system_config() {
906< 	local cfg="$1"
907< 
908< 	local hostname conloglevel timezone
909< 
910< 	config_get hostname "$cfg" hostname 'OpenWrt'
911< 	echo "$hostname" > /proc/sys/kernel/hostname
912< 
913< 	config_get conloglevel "$cfg" conloglevel
914< 	config_get buffersize "$cfg" buffersize
915< 	[ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
916< 	
917< 	config_get timezone "$cfg" timezone 'UTC'
918< 	echo "$timezone" > /tmp/TZ
919< 
920< 	if [ -x /sbin/syslogd ]; then
921< 		local log_ip log_size log_port log_type log_file
922< 		config_get log_ip "$cfg" log_ip 
923< 		config_get log_size "$cfg" log_size 16
924< 		config_get log_port "$cfg" log_port 514
925< 		config_get log_type "$cfg" log_type circular
926< 		config_get log_file "$cfg" log_file "/var/log/messages"
927< 		if [ "$log_type" = "file" ]; then
928< 			syslogd -s $log_size -O $log_file ${log_ip:+-L -R ${log_ip}:${log_port}} -S
929< 		else
930< 			syslogd -C${log_size} ${log_ip:+-L -R ${log_ip}:${log_port}}
931< 		fi
932< 	fi
933< 	config_get klogconloglevel "$cfg" klogconloglevel
934< 	[ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}
935< }
936< 
937< apply_uci_config() {(
938< 	include /lib/config
939< 	uci_apply_defaults
940< )}
941< 
94243a7,8
943> 	local commit_flag=0
944> 
94545,46d9
946< 	[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
947< 	[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
94848,50c11
949< 	apply_uci_config
950< 	config_load system
951< 	config_foreach system_config system
952---
953> 	klogd
95456,57d16
955< 	mkdir -p /tmp/.uci
956< 	chmod 0700 /tmp/.uci
95762,63c21
958< 	grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug
959< 	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
960---
961> 	mkdir -p /tmp/mnt
96278,79c36
963< 		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
964< 		[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
965---
966> 		ln -s 31:08 /dev/root
96781a39,56
968> 	/bin/datalib
969> 	/bin/mobiled
970> 
971> 	# Check the Calibration Data.
972> 	[ "x$(/bin/config get factory_mode)" = "x1" ] || /sbin/check_board_parameter
973> 
974> 	# Clean up the caldata_backup in flash
975> 	[ "x$(/bin/config get factory_mode)" = "x1" ] && /sbin/mtd erase /dev/mtd2 
976> 
977> 	# generate conf for wndr4500v3/wndr4300v2/wndr4520
978> 	/sbin/generate_board_conf.sh 
979> 
980> 	/sbin/printhosts
981> 
982> 	# Load LED/GPIO Driver and Initialize the related setting.
983> 	/sbin/insmod atherosgpio
984> 	/bin/mknod /dev/atherosgpio c 240 0
985> 
98682a58,241
987> 
988> 	# process user commands
989> 	[ -f /etc/rc.local ] && {
990> 		sh /etc/rc.local
991> 	}
992> 
993> 	# for ipv6 logo test
994> 	local logo_test=`/bin/config get endis_ipv6_logo_test`
995> 	local wan6_type=`/bin/config get ipv6_type`
996> 	echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
997> 	echo 1 > /proc/sys/dni_netfilter/ipv6_ip6frag_not_check_icmp
998> 	[ "x$logo_test" = "x1" ] && /bin/config set wan_endis_rspToPing=1
999> 	if [ "x$logo_test" = "x1" -a "x$wan6_type" = "xfixed" ]; then
1000> 		echo 1 > /proc/sys/net/ipv6/ipv6_ping6_interface
1001> 	fi
1002> 
1003> 	# generate the firewall rule file after loading the configuration data.
1004> 	/usr/sbin/net-wall rule
1005> 
1006> 	# start SIP ALG module
1007> 	/sbin/cmd_sipalg
1008> 
1009> 	# indicate the system first boot for first log
1010> 	$CONFIG set syslog_up_first=0
1011> 
1012> 	# Load Default QoS rules if needed.
1013> 	qos_dft="$($CONFIG get qos_list_default)"
1014> 	if [ "$qos_dft" = "1" ]; then
1015> 		count=1
1016> 		while :
1017> 		do
1018> 			qos_rule="$($CONFIG get qos_dft_list$count)"
1019> 			if [ "x$qos_rule" = "x" ]; then
1020> 				break;
1021> 			fi
1022> 			$CONFIG set qos_list$count="$qos_rule"
1023> 
1024> 			count=`expr $count + 1`
1025> 		done
1026> 
1027> 		count=`expr $count - 1`
1028> 		echo "$count QoS default rules are Loaded!"
1029> 
1030> 		$CONFIG set qos_list_default="0"
1031> 		commit_flag=1
1032> 		fi
1033> 
1034> 	#read serial number from flash to /tmp/Seria_Number
1035> 	/sbin/artmtd -r sn
1036> 	#read wan mac from flash to /tmp/wan_mac
1037> 	/sbin/artmtd -r mac
1038> 	#read hw id from flash to /tmp/hw_id
1039> 	/sbin/artmtd -r board_hw_id | cut -f 2 -d ':' > /tmp/hw_id
1040> 	#read model id from flash to /tmp/model_id
1041> 	/sbin/artmtd -r board_model_id | cut -f 2 -d ":" > /tmp/model_id
1042> 	# read board region from flash to /tmp/firmware_region
1043> 	/sbin/artmtd -r region
1044> 	# Check the Board Data region and reset Time Zone & Wirless Region & GUI Region.
1045> 	if [ "x$($CONFIG get board_region_default)" = "x1" ]; then
1046> 		region=`cat /tmp/firmware_region`
1047> 		case "$region" in
1048> 			RU)
1049> 				$CONFIG set wla_country="19"
1050> 				$CONFIG set wl_country="19"
1051> 				$CONFIG set ntp_server="GMT-4"
1052> 				$CONFIG set ntpserver_select="GMT-4"
1053> 				$CONFIG set ntp_hidden_select="26"
1054> 				$CONFIG set time_zone="GMT-4"
1055> 				$CONFIG set email_ntpserver="GMT-4"
1056> 				$CONFIG set region_flag="DISABLED"
1057> 				;;
1058> 			GR)
1059> 				$CONFIG set wla_country="4"
1060> 				$CONFIG set wl_country="4"
1061> 				$CONFIG set ntp_server="GMT-1"
1062> 				$CONFIG set ntpserver_select="GMT-1"
1063> 				$CONFIG set ntp_hidden_select="18"
1064> 				$CONFIG set time_zone="GMT-1"
1065> 				$CONFIG set email_ntpserver="GMT-1"
1066> 				;;
1067> 			PR)
1068> 				$CONFIG set wla_country="11"
1069> 				$CONFIG set wl_country="11"
1070> 				$CONFIG set ntp_server="GMT-8"
1071> 				$CONFIG set ntpserver_select="GMT-8"
1072> 				$CONFIG set ntp_hidden_select="32"
1073> 				$CONFIG set time_zone="GMT-8"
1074> 				$CONFIG set email_ntpserver="GMT-8"
1075> 				$CONFIG set wla_hidden_channel="149"
1076> 				;;
1077> 			BZ)
1078> 				$CONFIG set wla_country="9"
1079> 				$CONFIG set wl_country="9"
1080> 				$CONFIG set ntp_server="GMT+3"
1081> 				$CONFIG set ntpserver_select="GMT+3"
1082> 				$CONFIG set ntp_hidden_select="13"
1083> 				$CONFIG set time_zone="GMT+3"
1084> 				$CONFIG set email_ntpserver="GMT+3"
1085> 				;;
1086> 			IN)
1087> 				$CONFIG set wla_country="12"
1088> 				$CONFIG set wl_country="12"
1089> 				$CONFIG set ntp_server="GMT-5:30"
1090> 				$CONFIG set ntpserver_select="GMT-5:30"
1091> 				$CONFIG set ntp_hidden_select="29"
1092> 				$CONFIG set time_zone="GMT-5:30"
1093> 				$CONFIG set email_ntpserver="GMT-5:30"
1094> 				;;
1095> 			KO)
1096> 				$CONFIG set wla_country="7"
1097> 				$CONFIG set wl_country="7"
1098> 				$CONFIG set ntp_server="GMT-9"
1099> 				$CONFIG set ntpserver_select="GMT-9"
1100> 				$CONFIG set ntp_hidden_select="34"
1101> 				$CONFIG set time_zone="GMT-9"
1102> 				$CONFIG set email_ntpserver="GMT-9"
1103> 				;;
1104> 			JP)
1105> 				$CONFIG set wla_country="6"
1106> 				$CONFIG set wl_country="6"
1107> 				$CONFIG set ntp_server="GMT-9"
1108> 				$CONFIG set ntpserver_select="GMT-9"
1109> 				$CONFIG set ntp_hidden_select="34"
1110> 				$CONFIG set time_zone="GMT-9"
1111> 				$CONFIG set email_ntpserver="GMT-9"
1112> 				$CONFIG set region_flag="DISABLED"
1113> 				;;
1114> 			NA)
1115> 				$CONFIG set wla_country="10"
1116> 				$CONFIG set wl_country="10"
1117> 				$CONFIG set region_flag="DISABLED"
1118> 				$CONFIG set ntp_server="GMT+8"
1119> 				$CONFIG set ntpserver_select="GMT+8"
1120> 				$CONFIG set ntp_hidden_select="4"
1121> 				$CONFIG set time_zone="GMT+8"
1122> 				$CONFIG set email_ntpserver="GMT+8"
1123> 				$CONFIG set wla_hidden_channel="153"
1124> 				;;
1125> 			AU)
1126> 				$CONFIG set wla_country="2"
1127> 				$CONFIG set wl_country="2"
1128> 				$CONFIG set ntp_server="GMT-10"
1129> 				$CONFIG set ntpserver_select="GMT-10"
1130> 				$CONFIG set ntp_hidden_select="35"
1131> 				$CONFIG set time_zone="GMT-10"
1132> 				$CONFIG set email_ntpserver="GMT-10"
1133> 				;;
1134> 		esac
1135> 
1136> 		$CONFIG set board_region_default="0"
1137> 		commit_flag=1
1138> 	fi
1139> 
1140> 	# Wireless security pre-set
1141> 	id_dft="$($CONFIG get default_ssphrase)"
1142> 	if [ "$id_dft" = "1" ]; then
1143> 		/sbin/artmtd -r ssid
1144> 		/sbin/artmtd -r passphrase
1145> 
1146> 		if [ -s /tmp/ssid-setted ] && [ -s /tmp/passphrase-setted ]; then
1147> 			id_set=$(awk '{print $1}' /tmp/ssid-setted)
1148> 			ps_set=$(awk '{print $1}' /tmp/passphrase-setted)
1149> 
1150> 			$CONFIG set wl_ssid="$id_set"
1151> 			$CONFIG set wla_ssid="$id_set-5G"
1152> 			$CONFIG set wl_wpa2_psk="$ps_set"
1153> 			$CONFIG set wla_wpa2_psk="$ps_set"
1154> 			$CONFIG set wl_sectype="4"
1155> 			$CONFIG set wla_sectype="4"
1156> 			$CONFIG set wps_status="5"
1157> 			$CONFIG set wla_wps_status="5"
1158> 
1159> 			# set SSID of guest netwroks according to Home Router GUI Redesign Specification Rev10 section 6.3
1160> 			$CONFIG set wlg1_ssid="NETGEAR-Guest"
1161> 			$CONFIG set wla1_ssid="NETGEAR-5G-Guest"
1162> 		fi
1163> 
1164> 		$CONFIG set default_ssphrase="0"
1165> 		commit_flag=1
1166> 	fi
1167> 
1168> 	[ "$commit_flag" = "1" ] && $CONFIG commit
1169> 
1170> 	[ "x$(/bin/config get factory_mode)" = "x1" ] && touch /tmp/factory_test
1171Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/init.d: coldplug_net_iface
1172diff -r WNDR4300v2-basecompare/package/base-files/files/etc/init.d/done WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/init.d/done
11736,10c6,7
1174< 	[ -d /tmp/root ] && {
1175< 		lock /tmp/.switch2jffs
1176< 		firstboot switch2jffs
1177< 		lock -u /tmp/.switch2jffs
1178< 	}
1179---
1180> 	#Enable kernel configure for Igmp Snooping
1181> 	echo 1 > /proc/igmpsnoop
118212,19c9
1183< 	# process user commands
1184< 	[ -f /etc/rc.local ] && {
1185< 		sh /etc/rc.local
1186< 	}
1187< 
1188< 	# set leds to normal state
1189< 	. /etc/diag.sh
1190< 	set_state done
1191---
1192> 	# mm 0xb8070000 0x00000001
1193Seulement dans WNDR4300v2-basecompare/package/base-files/files/etc/init.d: fstab
1194Seulement dans WNDR4300v2-basecompare/package/base-files/files/etc/init.d: led
1195Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/init.d: modutils
1196Seulement dans WNDR4300v2-basecompare/package/base-files/files/etc/init.d: network
1197diff -r WNDR4300v2-basecompare/package/base-files/files/etc/init.d/rcS WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/init.d/rcS
11986,7c6,7
1199< 		[ -x $i ] && $i $2 2>&1
1200< 	done | $LOGGER
1201---
1202> 		[ -x $i ] && $i $2 
1203> 	done
120410,11d9
1205< LOGGER="cat"
1206< [ -x /usr/bin/logger ] && LOGGER="logger -s -p 6 -t sysinit"
120714c12,14
1208< 	run_scripts "$1" "$2" &
1209---
1210> 	echo 1 > /tmp/boot_status
1211> 	run_scripts "$1" "$2"
1212> 	rm -rf /tmp/boot_status
1213Seulement dans WNDR4300v2-basecompare/package/base-files/files/etc/init.d: watchdog
1214diff -r WNDR4300v2-basecompare/package/base-files/files/etc/preinit WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/preinit
12154,19d3
1216< . /etc/diag.sh
1217< 
1218< failsafe_ip() {
1219< 	ifconfig $ifname 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
1220< }
1221< 
1222< failsafe() {
1223< 	set_state failsafe
1224< 	[ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
1225< 		failsafe_ip
1226< 		netmsg 192.168.1.255 "Entering Failsafe!"
1227< 		telnetd -l /bin/login.sh <> /dev/null 2>&1
1228< 	}
1229< 	lock /tmp/.failsafe
1230< 	ash --login
1231< }
123225c9
1233< mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
1234---
1235> mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=0755
123667c51
1237< exec <$M0 >$M1 2>&0
1238---
1239> exec >$M1 2>/dev/console
124069,78d52
1241< echo "- preinit -"
1242< set_state preinit
1243< echo "Press CTRL-C for failsafe"
1244< trap 'FAILSAFE=true' INT
1245< trap 'FAILSAFE=true' USR1
1246< if [ -e /etc/preinit.arch ]; then
1247< 	. /etc/preinit.arch
1248< else
1249< 	sleep 2
1250< fi
125180,93d53
1252< export FAILSAFE
1253< eval ${FAILSAFE:+failsafe}
1254< lock -w /tmp/.failsafe
1255< 
1256< if [ -z "$INITRAMFS" ]; then
1257< 	mount_root
1258< 	[ -f /sysupgrade.tgz ] && {
1259< 		echo "- config restore -"
1260< 		cd /
1261< 		mv sysupgrade.tgz /tmp
1262< 		tar xzf /tmp/sysupgrade.tgz
1263< 		rm -f /tmp/sysupgrade.tgz
1264< 		sync
1265< 	}
126695c55
1267< 	echo "- init -"
1268---
1269> echo "- init -"
127097,98c57
1271< 	exec /sbin/init
1272< fi
1273---
1274> exec /sbin/init
1275diff -r WNDR4300v2-basecompare/package/base-files/files/etc/profile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/profile
12767c7
1277< export PS1='\u@\h:\w\$ '
1278---
1279> export PS1='\u@\h:\w\# '
1280Seulement dans WNDR4300v2-basecompare/package/base-files/files/etc: rc.d
1281Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc: rm_modem_driver
1282diff -r WNDR4300v2-basecompare/package/base-files/files/etc/sysctl.conf WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc/sysctl.conf
12831,3c1,7
1284< kernel.panic=3
1285< net.ipv4.conf.default.arp_ignore=1
1286< net.ipv4.conf.all.arp_ignore=1
1287---
1288> dni_netfilter.conntrack_refresh_support=1
1289> dni_netfilter.conntrack_refresh_outbound_only=1
1290> kernel.panic=1
1291> net.dni.dod_skip_control_packet=1
1292> net.ipv4.bridge_max_fdb_entry=1024
1293> net.ipv4.conf.default.arp_ignore=0
1294> net.ipv4.conf.all.arp_ignore=0
12954a9
1296> net.ipv4.ip_option_rr_ssrr_lsrr_pass_through=1
12976,12c11,18
1298< net.ipv4.icmp_ignore_bogus_error_responses=1
1299< net.ipv4.tcp_ecn=0 
1300< net.ipv4.tcp_fin_timeout=30
1301< net.ipv4.tcp_keepalive_time=120
1302< net.ipv4.tcp_syncookies=1
1303< net.ipv4.tcp_timestamps=0
1304< net.core.netdev_max_backlog=30
1305---
1306> net.ipv4.icmp_ignore_bogus_error_responses=0
1307> net.ipv4.tcp_ecn=0
1308> net.ipv4.tcp_fin_timeout=60
1309> net.ipv4.tcp_keepalive_time=7200
1310> net.ipv4.tcp_syncookies=0
1311> net.ipv4.tcp_timestamps=1
1312> net.ipv4.udp_ssdp_deliver_all=1
1313> net.core.netdev_max_backlog=1000
131415,18c21,31
1315< net.ipv4.netfilter.ip_conntrack_max=16384
1316< net.ipv4.netfilter.ip_conntrack_tcp_timeout_established=3600
1317< net.ipv4.netfilter.ip_conntrack_udp_timeout=60
1318< net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=180
1319---
1320> net.ipv4.netfilter.ip_conntrack_max=65536
1321> net.ipv4.netfilter.ip_conntrack_icmp_timeout=60
1322> net.ipv4.netfilter.ip_conntrack_tcp_timeout_established=1800
1323> net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait=60
1324> net.ipv4.netfilter.ip_conntrack_udp_timeout=300
1325> net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=300
1326> net.netfilter.nf_conntrack_expect_max=32
1327> net.ipv6.neigh.default.gc_thresh1=1024
1328> net.ipv6.neigh.default.gc_thresh2=1280
1329> net.ipv6.neigh.default.gc_thresh3=1536
1330> net.netfilter.nf_conntrack_acct=1
133119a33,36
1332> vm.dirty_background_ratio=5
1333> vm.dirty_ratio=5
1334> vm.min_free_kbytes=12288
1335> vm.overcommit_memory=0
1336Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/etc: usb_modem_hotplug
1337Seulement dans WNDR4300v2-basecompare/package/base-files/files/lib: config
1338Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/lib: ufsd
1339diff -r WNDR4300v2-basecompare/package/base-files/files/sbin/hotplug-call WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/sbin/hotplug-call
13408c8
1341< [ -d /sys/firmware -a "firmware" = "$HOTPLUG_TYPE" -a "add" = "$ACTION" ] && {
1342---
1343> [ "firmware" = "$HOTPLUG_TYPE" -a "add" = "$ACTION" ] && {
134424c24
1345< [ \! -z "$1" -a -d /etc/hotplug.d/$1 ] && {
1346---
1347> [ \! -z "$1" -a -d /etc/hotplug.d/$1 ] && [ $1 != "wps" ] && {
134827a28,33
1349> }
1350> 
1351> [ \! -z "$1" -a -d /etc/hotplug.d/$1 ] && [ $1 = "wps" ] && {
1352> 	for script in $(ls /etc/hotplug.d/$1/* 2>&-); do
1353> 		[ -f $script ] && sh $script &
1354> 	done
1355Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/sbin: qos.sh
1356diff -r WNDR4300v2-basecompare/package/base-files/files/sbin/sysupgrade WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/sbin/sysupgrade
135754,55c54
1358< 	find /etc/config /etc/passwd /etc/group /etc/dropbear \
1359< 		/etc/firewall.user /etc/rc.local -type f > "$file"
1360---
1361> 	find /etc/config /etc/passwd /etc/group /etc/dropbear /etc/firewall.user /etc/rc.local > "$file"
1362Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/files/sbin: usb-storage
1363Seulement dans WNDR4300v2-basecompare/package/base-files/files/sbin: wifi
1364diff -r WNDR4300v2-basecompare/package/base-files/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files/Makefile
136512c12
1366< PKG_RELEASE:=34
1367---
1368> PKG_RELEASE:=33
136950d49
1370< /etc/hosts
1371159d157
1372< ifneq ($(TARGET_avr32)$(TARGET_coldfire),)
1373161d158
1374< endif
1375316a314,318
1376> 	case $(CUSTOMER) in \
1377> 	    unknown) \
1378> 	    $(CP) dni-default/* $(1)/; \
1379> 	    ;; \
1380> 	esac
1381351c353,360
1382< 	mkdir -p $(1)/mnt
1383---
1384> 	case $(CUSTOMER) in \
1385> 	    netgear) \
1386> 	    ln -sf /tmp/mnt $(1)/mnt; \
1387> 	    ;; \
1388> 	    *) \
1389> 	    ln -sf /tmp/mnt $(1)/mnt; \
1390> 	    ;; \
1391> 	esac
1392359a369
1393> #	ln -sf /tmp/www $(1)/www
1394361,362c371,379
1395< 	rm -f $(1)/var
1396< 	ln -sf /tmp $(1)/var
1397---
1398> 	case $(CUSTOMER) in \
1399> 	    unknown) \
1400> 	    mkdir -p $(1)/var; \
1401> 	    ;; \
1402> 	    *) \
1403> 	    rm -f $(1)/var; \
1404> 	    ln -sf /tmp $(1)/var; \
1405> 	    ;; \
1406> 	esac
1407364c381,389
1408< 	ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/
1409---
1410> 	case $(CUSTOMER) in \
1411> 	    unknown) \
1412> 	    ;; \
1413> 	    *) \
1414> 	    ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/; \
1415> 	    ;; \
1416> 	esac
1417> 	ln -sf /tmp/hosts $(1)/etc/hosts
1418> 
1419Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/base-files: xscale-2.6
1420Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: bc
1421Seulement dans WNDR4300v2-basecompare/package: br2684ctl
1422Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: bridge-mode
1423Seulement dans WNDR4300v2-basecompare/package: broadcom-57xx
1424Seulement dans WNDR4300v2-basecompare/package: broadcom-diag
1425Seulement dans WNDR4300v2-basecompare/package: broadcom-mmc
1426Seulement dans WNDR4300v2-basecompare/package: broadcom-wl
1427Seulement dans WNDR4300v2-basecompare/package: busybox
1428Seulement dans WNDR4300v2-basecompare/package: button-hotplug
1429Seulement dans WNDR4300v2-basecompare/package: comgt
1430Seulement dans WNDR4300v2-basecompare/package: compcache
1431Seulement dans WNDR4300v2-basecompare/package: crda
1432Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: cyassl
1433Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: datalib
1434Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: db47
1435Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: detcable
1436Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: detwan
1437Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: disktype
1438Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dnibusybox
1439Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-chat
1440Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-dmapool
1441Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dnidnsmasq
1442Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-failover
1443Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-iproute2
1444Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dnimobile
1445Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-mtd
1446Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-mtdoops
1447Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-ntpclient
1448Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dnippp
1449Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dni-ripd
1450Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: dns-ipupdate
1451Seulement dans WNDR4300v2-basecompare/package: dnsmasq
1452Seulement dans WNDR4300v2-basecompare/package: dropbear
1453Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/e2fsprogs/files: e2fsck.conf
1454Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/e2fsprogs/files: e2fsck.sh
1455diff -r WNDR4300v2-basecompare/package/e2fsprogs/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/e2fsprogs/Makefile
14561,2c1,2
1457< #
1458< # Copyright (C) 2006-2008 OpenWrt.org
1459---
1460> # 
1461> # Copyright (C) 2006 OpenWrt.org
14626a7
1463> # $Id: Makefile 8172 2007-07-26 11:46:20Z kaloz $
146411,12c12
1465< PKG_VERSION:=1.40.11
1466< PKG_MD5SUM:=004cea70d724fdc7f1a952dffe4c9db8
1467---
1468> PKG_VERSION:=1.39
146916a17
1470> PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6
147120,24d20
1472< define Package/e2fsprogs/Default
1473<   URL:=http://e2fsprogs.sourceforge.net/
1474<   SUBMENU:=Filesystem
1475< endef
1476< 
147726d21
1478< $(call Package/e2fsprogs/Default)
147929,36c24,25
1480<   TITLE:=Ext2/3/4 filesystem utilities
1481<   DEPENDS:=+libblkid +libuuid +libext2fs +libpthread
1482< endef
1483< 
1484< define Package/e2fsprogs/description
1485<  This package contains essential ext2 filesystem utilities which consists of 
1486<  e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 
1487<  filesystem utilities.
1488---
1489>   TITLE:=Ext2/3 filesystem utilities
1490>   DEPENDS:=+libuuid
149140d28
1492< $(call Package/e2fsprogs/Default)
149344,60c32
1494< endef
1495< 
1496< define Package/libuuid/description
1497<  Library for generating DCE compatible Universally Unique Identifiers.
1498< endef
1499< 
1500< define Package/uuidgen
1501< $(call Package/e2fsprogs)
1502<   DEPENDS:=libuuid
1503<   TITLE:=Command line utility to create a new UUID value
1504< endef
1505< 
1506< define Package/uuidgen/description
1507<  uuidgen program creates a new universally unique identifier (UUID) 
1508<  using the libuuid library. The new UUID can reasonably be considered 
1509<  unique among all UUIDs created on the local system, and among UUIDs 
1510<  created on other systems in the past and in the future.
1511---
1512>   URL:=http://e2fsprogs.sourceforge.net/
151364d35
1514< $(call Package/e2fsprogs/Default)
151568,83c39
1516< endef
1517< 
1518< define Package/libblkid/description
1519<  The blkid library which allows system programs like fsck and mount to 
1520<  quickly and easily find block devices by filesystem UUID and LABEL.
1521< endef
1522< 
1523< define Package/libext2fs
1524< $(call Package/e2fsprogs/Default)
1525<   SECTION:=libs
1526<   CATEGORY:=Libraries
1527<   TITLE:=ext2/3/4 filesystem library
1528< endef
1529< 
1530< define Package/libext2fs/description
1531< libext2fs is a library which can access ext2, ext3 and ext4 filesystems.
1532---
1533>   URL:=http://e2fsprogs.sourceforge.net/
153487c43
1535< $(call Package/e2fsprogs)
1536---
1537>   $(call Package/e2fsprogs)
153893c49
1539< $(call Package/e2fsprogs)
1540---
1541>   $(call Package/e2fsprogs)
154298,111d53
1543< define Package/badblocks
1544< $(call Package/e2fsprogs)
1545<   TITLE:=Ext2 Filesystem badblocks utility
1546<   DEPENDS:=e2fsprogs
1547< endef
1548< 
1549< define Package/blkid
1550< $(call Package/e2fsprogs)
1551<   TITLE:=Command-line utility to locate/print block device attributes
1552<   DEPENDS:=libuuid libblkid
1553< endef
1554< 
1555< TARGET_CFLAGS += $(FPIC)
1556< 
1557117,118c59
1558< 	--enable-dynamic-e2fsck \
1559< 	--disable-tls
1560---
1561> 	--enable-dynamic-e2fsck
1562141c82
1563< 		DESTDIR="$(1)" \
1564---
1565> 		DESTDIR="$(STAGING_DIR)" \
1566143,146d83
1567< 	$(MAKE) -C $(PKG_BUILD_DIR)/lib/ext2fs \
1568< 		BUILDCC="$(HOSTCC)" \
1569< 		DESTDIR="$(1)" \
1570< 		install
1571151,152c88,89
1572< 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/
1573< 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/
1574---
1575> 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/
1576> 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/
1577155d91
1578< 	ln -sf mke2fs $(1)/usr/sbin/mkfs.ext4
1579157,160c93
1580< 	$(CP) $(foreach lib,com_err e2p,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/
1581< 	$(INSTALL_DIR) $(1)/etc/init.d
1582< 	$(INSTALL_BIN) ./files/e2fsck.init $(1)/etc/init.d/e2fsck
1583< 
1584---
1585> 	$(CP) $(foreach lib,blkid com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/
1586168,172d100
1587< define Package/uuidgen/install
1588< 	$(INSTALL_DIR) $(1)/usr/bin
1589< 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uuidgen $(1)/usr/bin/
1590< endef
1591< 
1592174c102
1593< 	$(INSTALL_DIR) $(1)/usr/lib
1594---
1595> 	$(INSTALL_DIR) $(1)/usr/lib/
1596178,182d105
1597< define Package/libext2fs/install
1598< 	$(INSTALL_DIR) $(1)/usr/lib
1599< 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so* $(1)/usr/lib/
1600< endef
1601< 
1602185c108
1603< 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
1604---
1605> 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
1606190,200c113
1607< 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/
1608< endef
1609< 
1610< define Package/badblocks/install
1611< 	$(INSTALL_DIR) $(1)/usr/sbin
1612< 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/badblocks $(1)/usr/sbin/
1613< endef
1614< 
1615< define Package/blkid/install
1616< 	$(INSTALL_DIR) $(1)/usr/sbin
1617< 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkid $(1)/usr/sbin/
1618---
1619> 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/
1620205d117
1621< $(eval $(call BuildPackage,uuidgen))
1622207d118
1623< $(eval $(call BuildPackage,libext2fs))
1624210,211d120
1625< $(eval $(call BuildPackage,badblocks))
1626< $(eval $(call BuildPackage,blkid))
1627Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/e2fsprogs: patches
1628Seulement dans WNDR4300v2-basecompare/package: ead
1629Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/ebtables: files
1630diff -r WNDR4300v2-basecompare/package/ebtables/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/ebtables/Makefile
163159a60,61
1632> 	$(INSTALL_DIR) $(1)/sbin
1633> 	$(INSTALL_BIN) ./files/cmd_ebtables $(1)/sbin
1634Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/ebtables: patches
1635Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: expat
1636Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ez-ipupdate
1637Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: factory-tools
1638Seulement dans WNDR4300v2-basecompare/package: fconfig
1639Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: fetchpin
1640Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ffmpeg
1641Seulement dans WNDR4300v2-basecompare/package: firewall
1642Seulement dans WNDR4300v2-basecompare/package: fuse
1643Seulement dans WNDR4300v2-basecompare/package: fuse24
1644Seulement dans WNDR4300v2-basecompare/package: gdb
1645Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: gdbm
1646Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: gettext
1647Seulement dans WNDR4300v2-basecompare/package: goldfish-qemu
1648Seulement dans WNDR4300v2-basecompare/package: gpioctl
1649Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: greendownload
1650Seulement dans WNDR4300v2-basecompare/package: grub
1651Seulement dans WNDR4300v2-basecompare/package: hostapd
1652Seulement dans WNDR4300v2-basecompare/package: hostap-driver
1653Seulement dans WNDR4300v2-basecompare/package: hostap-utils
1654Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/files: app_mount
1655Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/files: hotplug2.init
1656Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/files: hotplug2.mount
1657diff -r WNDR4300v2-basecompare/package/hotplug2/files/hotplug2.rules WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/files/hotplug2.rules
16581c1
1659< $include /etc/hotplug2-common.rules
1660---
1661> # rules file for hotplug2
16623,4c3,4
1663< SUBSYSTEM ~~ (net|button|usb|platform|ieee1394|block|atm) {
1664< 	exec /sbin/hotplug-call %SUBSYSTEM%
1665---
1666> SUBSYSTEM == block, DEVPATH is set, MAJOR is set, MINOR is set {
1667>         makedev /dev/%DEVICENAME% 0644
16687,9c7,49
1669< DEVICENAME ~~ (watchdog) {
1670< 	exec /sbin/watchdog -t 5 /dev/watchdog
1671< 	next
1672---
1673> #For debugging
1674> #ACTION is set {
1675> #       printdebug
1676> #}
1677> 
1678> # Load modules (what old hotplug did)
1679> ACTION == add, MODALIAS is set, INTERFACE is set {
1680>        exec modprobe -q %MODALIAS% ;
1681>                exec /sbin/manage_usb_led.sh ;
1682>                exec /etc/usb_modem_hotplug  %INTERFACE% on ;
1683> }
1684> 
1685> ACTION == remove, MODALIAS is set, INTERFACE is set {
1686>                exec /sbin/manage_usb_led.sh ;
1687>                exec /etc/usb_modem_hotplug  %INTERFACE% off ;
1688> }
1689> # Create device nodes
1690> DEVPATH is set, MAJOR is set, MINOR is set {
1691>         makedev /dev/%DEVICENAME% 0644
1692> }
1693> 
1694> # Mount a USB flashdisk
1695> #ACTION == add, PHYSDEVPATH ~~ "/usb[0-9]*/", DEVICENAME ~~ "^sd[a-z][0-9]+$", DEVPATH is set, MAJOR is set, MINOR is set {
1696> #	makedev /dev/%DEVICENAME% 0644
1697> #	run "/sbin/hotplug2.mount %DEVICENAME%"
1698> #	run "/usr/sbin/usb_cfg approve %DEVICENAME%"
1699> #	run "/bin/sleep 2"
1700> #	run "/usr/sbin/update_smb -a %DEVICENAME%"
1701> #	run "/sbin/cmdftp start"
1702> #	run "/usr/sbin/chkfuppes"
1703> #}
1704> 
1705> # Unmount a USB flashdisk
1706> ACTION == remove, DEVPATH ~~ "/usb[0-9]*/", DEVICENAME ~~ "^sd[a-z][0-9]*$", MAJOR is set, MINOR is set {
1707> 	run "/usr/sbin/detach_afp_shares %DEVICENAME% hotplug2"
1708> 	exec /sbin/hotplug2.umount %DEVICENAME% ;
1709> 	run "/usr/sbin/chkfuppes"
1710> 	exec /bin/rm /tmp/umount_result ;
1711> }
1712> 
1713> # WLAN Toggle
1714> SUBSYSTEM == button, BUTTON == wlan_toggle, ACTION == pressed {
1715>         exec /etc/ath/wifi_toggle ;
171610a51,69
1717> 
1718> # WLAN logger
1719> SUBSYSTEM == wlan-log, TYPE == acl {
1720>         exec logger "[WLAN access %REPORT_ACTION%] from MAC: %MAC%," ;
1721> }
1722> 
1723> SUBSYSTEM == wlan-log, TYPE == auth {
1724>         exec logger "[WLAN access %REPORT_ACTION%: incorrect security] from MAC address %MAC%," ;
1725> }
1726> 
1727> # WPS Button
1728> SUBSYSTEM == button, BUTTON == wps_button, ACTION == pressed {
1729>         exec /sbin/wps_led_control pressed;
1730> }
1731> 
1732> SUBSYSTEM == button, BUTTON == wps_button, ACTION == released {
1733>         exec /sbin/wps_led_control released;
1734> }
1735> 
1736Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/files: hotplug2.testbusy
1737Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/files: hotplug2.umount
1738Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/files: umount_unapproved
1739diff -r WNDR4300v2-basecompare/package/hotplug2/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/hotplug2/Makefile
174044a45
1741> 	$(INSTALL_DIR) $(1)/etc/init.d
174245a47
1743> 	$(INSTALL_BIN) ./files/hotplug2.init $(1)/etc/init.d/hotplug2
174447a50,54
1745> 	$(INSTALL_BIN) ./files/hotplug2.mount $(1)/sbin/
1746> 	$(INSTALL_BIN) ./files/hotplug2.umount $(1)/sbin/
1747> 	$(INSTALL_BIN) ./files/umount_unapproved $(1)/sbin/
1748> 	$(INSTALL_BIN) ./files/app_mount $(1)/sbin/
1749> 	$(INSTALL_BIN) ./files/hotplug2.testbusy $(1)/sbin/
1750Seulement dans WNDR4300v2-basecompare/package: i2c-gpio-custom
1751Seulement dans WNDR4300v2-basecompare/package: ifenslave
1752Seulement dans WNDR4300v2-basecompare/package: ifxmips-dsl-api
1753Seulement dans WNDR4300v2-basecompare/package: ifxmips-dsl-control
1754Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: igmpproxy
1755Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ipp
1756Seulement dans WNDR4300v2-basecompare/package: iproute2
1757Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/iptables/files: firewall.init
1758diff -r WNDR4300v2-basecompare/package/iptables/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/iptables/Makefile
175920a21
1760> PKG_GIT_TREEISH:=iptables-v1.4.4-dni1
176121a23,25
1762> ifeq ($(CONFIG_EXTERNAL_KERNEL_TREE),)
1763> PATCH_DIR:=
1764> else
176522a27
1766> endif
176737a43
1768>   DEPENDS:=@TARGET_dniwndr3700u2631||TARGET_wndr4500v3
1769245a252
1770> TARGET_CFLAGS += $(FPIC)
1771261a269,272
1772> 
1773> define Build/Prepare
1774> 	$(CP) $(GIT_HOME)/iptables.git/* $(PKG_BUILD_DIR)/
1775> endef
1776Seulement dans WNDR4300v2-basecompare/package/iptables: patches
1777Seulement dans WNDR4300v2-basecompare/package: iw
1778Seulement dans WNDR4300v2-basecompare/package: ixp4xx-microcode
1779Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kcode
1780diff -r WNDR4300v2-basecompare/package/kernel/modules/fs.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/kernel/modules/fs.mk
178185c85
1782<   AUTOLOAD:=$(call AutoLoad,32,ext2)
1783---
1784>   AUTOLOAD:=$(call AutoLoad,30,ext2)
1785105c105
1786<   AUTOLOAD:=$(call AutoLoad,31,jbd ext3)
1787---
1788>   AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
1789diff -r WNDR4300v2-basecompare/package/kernel/modules/netdevices.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/kernel/modules/netdevices.mk
1790116c116
1791<   DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86
1792---
1793>   DEPENDS:=@TARGET_ixp4xx||TARGET_x86
1794204c204
1795<   DEPENDS:=@PCI_SUPPORT
1796---
1797>   DEPENDS:=@TARGET_x86
1798206,207c206
1799<     CONFIG_E1000_DISABLE_PACKET_SPLIT=n \
1800<     CONFIG_E1000_NAPI=y
1801---
1802>     CONFIG_E1000_DISABLE_PACKET_SPLIT=n
1803diff -r WNDR4300v2-basecompare/package/kernel/modules/netfilter.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/kernel/modules/netfilter.mk
1804155a156,222
1805> define KernelPackage/ipt-snatp2p
1806>   SUBMENU:=$(NF_MENU)
1807>   TITLE:=SNATP2P target
1808>   KCONFIG:=$(KCONFIG_IPT_SNATP2P)
1809>   FILES:=$(foreach mod,$(IPT_SNATP2P-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
1810>   AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_SNATP2P-m)))
1811>   DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack @TARGET_wndr4500v3
1812> endef
1813> 
1814> define KernelPackage/ipt-snatp2p/description
1815>  Netfilter (IPv4) kernel modules for SNATP2P targets
1816>  Includes:
1817>  - SNATP2P
1818> endef
1819> 
1820> $(eval $(call KernelPackage,ipt-snatp2p))
1821> 
1822> define KernelPackage/ipt-hairpin
1823>   SUBMENU:=$(NF_MENU)
1824>   TITLE:=HAIRPIN target
1825>   KCONFIG:=$(KCONFIG_IPT_HAIRPIN)
1826>   FILES:=$(foreach mod,$(IPT_HAIRPIN-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
1827>   AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_HAIRPIN-m)))
1828>   DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack @TARGET_wndr4500v3
1829> endef
1830> 
1831> define KernelPackage/ipt-hairpin/description
1832>  Netfilter (IPv4) kernel modules for HAIRPIN targets
1833>  Includes:
1834>  - HAIRPIN
1835> endef
1836> 
1837> $(eval $(call KernelPackage,ipt-hairpin))
1838> 
1839> define KernelPackage/ipt-dnatp2p
1840>   SUBMENU:=$(NF_MENU)
1841>   TITLE:=DNATP2P target
1842>   KCONFIG:=$(KCONFIG_IPT_DNATP2P)
1843>   FILES:=$(foreach mod,$(IPT_DNATP2P-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
1844>   AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_DNATP2P-m)))
1845>   DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack @TARGET_wndr4500v3
1846> endef
1847> 
1848> define KernelPackage/ipt-dnatp2p/description
1849>   Netfilter (IPv4) kernel modules for DNATP2P targets
1850>   Includes:
1851>   - DNATP2P
1852> endef
1853> 
1854> $(eval $(call KernelPackage,ipt-dnatp2p))
1855> 
1856> define KernelPackage/ipt-log
1857>   SUBMENU:=$(NF_MENU)
1858>   TITLE:=LOG match
1859>   KCONFIG:=$(KCONFIG_IPT_LOG)
1860>   FILES:=$(foreach mod,$(IPT_LOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
1861>   AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_LOG-m)))
1862>   DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack @TARGET_wndr4500v3
1863> endef
1864> 
1865> define KernelPackage/ipt-log/description
1866>   Netfilter (IPv4) kernel modules for LOG match
1867>   Includes:
1868>   - LOG
1869> endef
1870> 
1871> $(eval $(call KernelPackage,ipt-log))
1872diff -r WNDR4300v2-basecompare/package/kernel/modules/other.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/kernel/modules/other.mk
1873422,436d421
1874< define KernelPackage/rdc321x-wdt
1875<   SUBMENU:=$(OTHER_MENU)
1876<   TITLE:=RDC321x watchdog
1877<   DEPENDS:=@TARGET_rdc
1878<   KCONFIG:=CONFIG_RDC321X_WDT
1879<   FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.$(LINUX_KMOD_SUFFIX)
1880<   AUTOLOAD:=$(call AutoLoad,50,rdc321_wdt)
1881< endef
1882< 
1883< define KernelPackage/rdc321x-wdt/description
1884<   RDC-321x watchdog driver
1885< endef
1886< 
1887< $(eval $(call KernelPackage,rdc321x-wdt))
1888< 
1889507,509c492,494
1890<   KCONFIG:=CONFIG_LEDS_ALIX2
1891<   FILES:=$(LINUX_DIR)/drivers/leds/leds-alix2.$(LINUX_KMOD_SUFFIX)
1892<   AUTOLOAD:=$(call AutoLoad,50,leds-alix2)
1893---
1894>   KCONFIG:=CONFIG_LEDS_ALIX
1895>   FILES:=$(LINUX_DIR)/drivers/leds/leds-alix.$(LINUX_KMOD_SUFFIX)
1896>   AUTOLOAD:=$(call AutoLoad,50,leds-alix)
1897diff -r WNDR4300v2-basecompare/package/kernel/modules/sound.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/kernel/modules/sound.mk
189827,28c27
1899< 	CONFIG_SND_MIXER_OSS \
1900< 	CONFIG_SOUND_OSS_CORE_PRECLAIM=y
1901---
1902> 	CONFIG_SND_MIXER_OSS
1903diff -r WNDR4300v2-basecompare/package/kernel/modules/video.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/kernel/modules/video.mk
190416d15
1905< 	CONFIG_MEDIA_SUPPORT=m \
1906Seulement dans WNDR4300v2-basecompare/package: kexec-tools
1907Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-conenat
1908Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-dnih323
1909Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-dni-lan-qos
1910Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-dni-qos
1911Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-dnirtsp
1912Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-dnisip
1913Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-dnshijack
1914Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-ftp-alg
1915Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-hw-cdc
1916Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-ipsec-alg
1917Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-ipv6-cone
1918Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-l2tp
1919Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-nat2.5
1920Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-netgear-reject
1921Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-pptp
1922Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-pptp-alg
1923Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-spiadvdos
1924Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-spidos
1925Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-starcraft
1926Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-trigger
1927Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: kmod-urlblock
1928Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: led-control
1929Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: led-extender
1930Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libcryptoxx
1931Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libcurl
1932Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libdaemon
1933Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libevent2
1934Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libexif
1935Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libflac
1936Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libgcrypt
1937Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libgpg-error
1938Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libiconv
1939Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libid3tag
1940Seulement dans WNDR4300v2-basecompare/package: libipfix
1941Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libjpeg
1942Seulement dans WNDR4300v2-basecompare/package: libnl
1943Seulement dans WNDR4300v2-basecompare/package: libnl-tiny
1944Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libogg
1945Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libpng
1946Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libusb
1947Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libvorbis
1948Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libwxwidgets
1949Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: libxml2
1950Seulement dans WNDR4300v2-basecompare/package: linux-atm
1951Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: lltd
1952Seulement dans WNDR4300v2-basecompare/package: mac80211
1953Seulement dans WNDR4300v2-basecompare/package: madwifi
1954diff -r WNDR4300v2-basecompare/package/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/Makefile
195578a79,80
1956> 	$(if $(CONFIG_CLEAN_TOOLCHAIN_CACHE),rm -rf $(BUILD_DIR_HOST);\
1957> 		rm -rf $(BUILD_DIR_TOOLCHAIN))
1958Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: minidlna
1959Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: miniupnpd
1960Seulement dans WNDR4300v2-basecompare/package: mmc_over_gpio
1961Seulement dans WNDR4300v2-basecompare/package: mountd
1962Seulement dans WNDR4300v2-basecompare/package: mtd
1963Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: net6conf
1964Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: netatalk
1965Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: netatalk-utility
1966Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: net-cgi
1967Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: net-disk
1968Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: net-dump
1969Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: net-scan
1970Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: net-util
1971Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: net-wall
1972Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: noip
1973Seulement dans WNDR4300v2-basecompare/package: nozomi
1974Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ntgrddns
1975Seulement dans WNDR4300v2-basecompare/package: nvram
1976Seulement dans WNDR4300v2-basecompare/package: ocf-crypto-headers
1977Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ookla
1978Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl: Config.in
1979diff -r WNDR4300v2-basecompare/package/openssl/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/Makefile
19802c2
1981< # Copyright (C) 2006-2009 OpenWrt.org
1982---
1983> # Copyright (C) 2006-2010 OpenWrt.org
198411c11
1985< PKG_VERSION:=0.9.8l
1986---
1987> PKG_VERSION:=0.9.8p
198819c19
1989< PKG_MD5SUM:=05a0ece1372392a2cf310ebb96333025
1990---
1991> PKG_MD5SUM:=7f24047f70364c9eabc94899e356ce39
199221a22
1993> PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE
199429a31,34
1995> define Package/libopenssl/config
1996> source "$(SOURCE)/Config.in"
1997> endef
1998> 
199931,34c36,39
2000<  The OpenSSL Project is a collaborative effort to develop a robust,
2001<  commercial-grade, full-featured, and Open Source toolkit implementing the
2002<  Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
2003<  protocols as well as a full-strength general purpose cryptography library.
2004---
2005> The OpenSSL Project is a collaborative effort to develop a robust,
2006> commercial-grade, full-featured, and Open Source toolkit implementing the Secure
2007> Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well
2008> as a full-strength general purpose cryptography library.
200943a49
2010>   MENU:=1
201148,49c54
2012<  This package contains the OpenSSL shared libraries, needed by other
2013<  programs.
2014---
2015> This package contains the OpenSSL shared libraries, needed by other programs.
201666c71
2017<  This package contains the OpenSSL command-line utility.
2018---
2019> This package contains the OpenSSL command-line utility.
202072,74c77,80
2021< ifeq ($(BOARD),ixp4xx)
2022< OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \
2023< 					no-sse2 no-perlasm --with-cryptodev
2024---
2025> OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2
2026> 
2027> ifdef CONFIG_OPENSSL_ENGINE
2028>   OPENSSL_OPTIONS += --with-cryptodev
202976,77c82
2030< OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \
2031< 					no-engines no-sse2 no-perlasm
2032---
2033>   OPENSSL_OPTIONS += no-engines
203479a85
2035> OPENSSL_OPTIONS += no-perlasm
2036102a109
2037> 		$(OPENSSL_MAKEFLAGS) \
2038103a111,117
2039> 	$(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR) \
2040> 		CC="$(TARGET_CC)" \
2041> 		AR="$(TARGET_CROSS)ar r" \
2042> 		RANLIB="$(TARGET_CROSS)ranlib" \
2043> 		OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
2044> 		$(OPENSSL_MAKEFLAGS) \
2045> 		all
2046109c123,124
2047< 		all build-shared
2048---
2049> 		$(OPENSSL_MAKEFLAGS) \
2050> 		build-shared
2051114a130
2052> 		$(OPENSSL_MAKEFLAGS) \
2053117a134
2054> 		$(OPENSSL_MAKEFLAGS) \
2055122c139
2056< 	mkdir -p $(1)/usr/include
2057---
2058> 	$(INSTALL_DIR) $(1)/usr/include
2059124c141
2060< 	mkdir -p $(1)/usr/lib/
2061---
2062> 	$(INSTALL_DIR) $(1)/usr/lib/
2063126c143
2064< 	mkdir -p $(1)/usr/lib/pkgconfig
2065---
2066> 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
2067Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 001-upstream_dtls_cisco.patch
2068Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 100-parallel-build.patch
2069diff -r WNDR4300v2-basecompare/package/openssl/patches/110-optimize-for-size.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/110-optimize-for-size.patch
20701,4c1,3
2071< diff -ur openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
2072< --- openssl-0.9.8h.orig/Configure	2008-05-31 17:27:47.000000000 +0200
2073< +++ openssl-0.9.8h/Configure	2008-05-31 17:28:16.000000000 +0200
2074< @@ -357,6 +357,8 @@
2075---
2076> --- a/Configure
2077> +++ b/Configure
2078> @@ -370,6 +370,8 @@ my %table=(
2079diff -r WNDR4300v2-basecompare/package/openssl/patches/120-makedepend.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/120-makedepend.patch
20801,14c1,3
2081< diff -burN openssl-0.9.8k/util/domd openssl-0.9.8k.patched/util/domd
2082< --- openssl-0.9.8k/util/domd	2009-01-21 22:44:52.000000000 +0100
2083< +++ openssl-0.9.8k.patched/util/domd	2009-03-26 15:46:28.600347986 +0100
2084< @@ -14,7 +14,8 @@
2085<  cp Makefile Makefile.save
2086<  # fake the presence of Kerberos
2087<  touch $TOP/krb5.h
2088< -if [ "$MAKEDEPEND" = "gcc" ]; then
2089< +D=${MAKEDEPEND/%*gcc/gcc}
2090< +if [ "$D" = "gcc" ]; then
2091<      args=""
2092<      while [ $# -gt 0 ]; do
2093<  	if [ "$1" != "--" ]; then args="$args $1"; fi
2094< @@ -22,7 +23,7 @@
2095---
2096> --- a/util/domd
2097> +++ b/util/domd
2098> @@ -22,7 +22,7 @@ if expr "$MAKEDEPEND" : '.*gcc$' > /dev/
2099Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 121-ocf-config.patch
2100diff -r WNDR4300v2-basecompare/package/openssl/patches/130-perl-path.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/130-perl-path.patch
21011,4c1,2
2102< Index: openssl-0.9.8e/Configure
2103< ===================================================================
2104< --- openssl-0.9.8e.orig/Configure	2007-06-04 13:23:32.217836040 +0200
2105< +++ openssl-0.9.8e/Configure	2007-06-04 13:23:32.598778128 +0200
2106---
2107> --- a/Configure
2108> +++ b/Configure
210911,14c9,10
2110< Index: openssl-0.9.8e/tools/c_rehash.in
2111< ===================================================================
2112< --- openssl-0.9.8e.orig/tools/c_rehash.in	2007-06-04 13:23:32.074857776 +0200
2113< +++ openssl-0.9.8e/tools/c_rehash.in	2007-06-04 13:23:32.598778128 +0200
2114---
2115> --- a/tools/c_rehash.in
2116> +++ b/tools/c_rehash.in
211721,24c17,18
2118< Index: openssl-0.9.8e/util/clean-depend.pl
2119< ===================================================================
2120< --- openssl-0.9.8e.orig/util/clean-depend.pl	2007-06-04 13:23:32.080856864 +0200
2121< +++ openssl-0.9.8e/util/clean-depend.pl	2007-06-04 13:23:32.598778128 +0200
2122---
2123> --- a/util/clean-depend.pl
2124> +++ b/util/clean-depend.pl
212531,34c25,26
2126< Index: openssl-0.9.8e/util/mkdef.pl
2127< ===================================================================
2128< --- openssl-0.9.8e.orig/util/mkdef.pl	2007-06-04 13:23:32.085856104 +0200
2129< +++ openssl-0.9.8e/util/mkdef.pl	2007-06-04 13:23:32.599777976 +0200
2130---
2131> --- a/util/mkdef.pl
2132> +++ b/util/mkdef.pl
213341,44c33,34
2134< Index: openssl-0.9.8e/util/mkerr.pl
2135< ===================================================================
2136< --- openssl-0.9.8e.orig/util/mkerr.pl	2007-06-04 13:23:32.091855192 +0200
2137< +++ openssl-0.9.8e/util/mkerr.pl	2007-06-04 13:23:32.599777976 +0200
2138---
2139> --- a/util/mkerr.pl
2140> +++ b/util/mkerr.pl
214151,54c41,42
2142< Index: openssl-0.9.8e/util/mkstack.pl
2143< ===================================================================
2144< --- openssl-0.9.8e.orig/util/mkstack.pl	2007-06-04 13:23:32.096854432 +0200
2145< +++ openssl-0.9.8e/util/mkstack.pl	2007-06-04 13:23:32.600777824 +0200
2146---
2147> --- a/util/mkstack.pl
2148> +++ b/util/mkstack.pl
214961,64c49,50
2150< Index: openssl-0.9.8e/util/pod2man.pl
2151< ===================================================================
2152< --- openssl-0.9.8e.orig/util/pod2man.pl	2007-06-04 13:23:32.102853520 +0200
2153< +++ openssl-0.9.8e/util/pod2man.pl	2007-06-04 13:23:32.600777824 +0200
2154---
2155> --- a/util/pod2man.pl
2156> +++ b/util/pod2man.pl
215771,74c57,58
2158< Index: openssl-0.9.8e/util/selftest.pl
2159< ===================================================================
2160< --- openssl-0.9.8e.orig/util/selftest.pl	2007-06-04 13:23:32.109852456 +0200
2161< +++ openssl-0.9.8e/util/selftest.pl	2007-06-04 13:23:32.600777824 +0200
2162---
2163> --- a/util/selftest.pl
2164> +++ b/util/selftest.pl
2165diff -r WNDR4300v2-basecompare/package/openssl/patches/140-makefile-dirs.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/140-makefile-dirs.patch
21661,3c1,3
2167< --- openssl-0.9.8j/Makefile.org	2008-12-30 14:26:26.000000000 +0100
2168< +++ openssl-0.9.8j.patched/Makefile.org	2009-01-17 13:41:52.610868317 +0100
2169< @@ -131,7 +131,7 @@
2170---
2171> --- a/Makefile.org
2172> +++ b/Makefile.org
2173> @@ -132,7 +132,7 @@ FIPSCANLIB=
2174diff -r WNDR4300v2-basecompare/package/openssl/patches/150-no_engines.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/150-no_engines.patch
21751,4c1,3
2176< diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure
2177< --- openssl-0.9.8i.orig/Configure	2008-05-31 17:31:04.000000000 +0200
2178< +++ openssl-0.9.8i/Configure	2008-05-31 17:30:47.000000000 +0200
2179< @@ -1714,6 +1714,11 @@
2180---
2181> --- a/Configure
2182> +++ b/Configure
2183> @@ -1904,6 +1904,11 @@ EOF
218416,19c15,17
2185< diff -ur openssl-0.9.8i.orig/util/libeay.num openssl-0.9.8i/util/libeay.num
2186< --- openssl-0.9.8i.orig/util/libeay.num	2008-05-31 17:27:46.000000000 +0200
2187< +++ openssl-0.9.8i/util/libeay.num	2008-05-31 17:30:47.000000000 +0200
2188< @@ -2071,7 +2071,6 @@
2189---
2190> --- a/util/libeay.num
2191> +++ b/util/libeay.num
2192> @@ -2071,7 +2071,6 @@ PKCS7_ATTR_SIGN_it                      
219327c25
2194< @@ -2545,7 +2544,6 @@
2195---
2196> @@ -2545,7 +2544,6 @@ OCSP_RESPONSE_new                       
219735c33
2198< @@ -2576,7 +2574,6 @@
2199---
2200> @@ -2576,7 +2574,6 @@ ASN1_primitive_free                     
220143c41
2202< @@ -2600,7 +2597,6 @@
2203---
2204> @@ -2600,7 +2597,6 @@ asn1_get_choice_selector                
220551c49
2206< @@ -2667,7 +2663,6 @@
2207---
2208> @@ -2667,7 +2663,6 @@ OCSP_CRLID_it                           
220959c57
2210< @@ -2762,8 +2757,6 @@
2211---
2212> @@ -2762,8 +2757,6 @@ DES_read_2passwords                     
221368c66
2214< @@ -2772,7 +2765,6 @@
2215---
2216> @@ -2772,7 +2765,6 @@ OPENSSL_load_builtin_modules            
221776c74
2218< @@ -3107,7 +3099,6 @@
2219---
2220> @@ -3107,7 +3099,6 @@ EC_GFp_nist_method                      
2221diff -r WNDR4300v2-basecompare/package/openssl/patches/160-disable_doc_tests.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/160-disable_doc_tests.patch
22221,4c1,3
2223< diff -burN openssl-0.9.8k/Makefile openssl-0.9.8k.patched/Makefile
2224< --- openssl-0.9.8k/Makefile	2009-03-25 14:11:43.000000000 +0100
2225< +++ openssl-0.9.8k.patched/Makefile	2009-03-26 15:28:35.483566078 +0100
2226< @@ -133,7 +133,7 @@
2227---
2228> --- a/Makefile
2229> +++ b/Makefile
2230> @@ -134,7 +134,7 @@ FIPSCANLIB=
223113c12
2232< @@ -150,7 +150,7 @@
2233---
2234> @@ -151,7 +151,7 @@ SDIRS=  \
223522c21
2236< @@ -162,7 +162,7 @@
2237---
2238> @@ -163,7 +163,7 @@ SHELL=/bin/sh
223931c30
2240< @@ -321,7 +321,7 @@
2241---
2242> @@ -323,7 +323,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
224340c39
2244< @@ -613,7 +613,7 @@
2245---
2246> @@ -617,7 +617,7 @@ dist:   
224749,52c48,50
2248< diff -burN openssl-0.9.8k/Makefile.org openssl-0.9.8k.patched/Makefile.org
2249< --- openssl-0.9.8k/Makefile.org	2009-03-03 23:40:29.000000000 +0100
2250< +++ openssl-0.9.8k.patched/Makefile.org	2009-03-26 15:29:05.243750064 +0100
2251< @@ -611,7 +611,7 @@
2252---
2253> --- a/Makefile.org
2254> +++ b/Makefile.org
2255> @@ -615,7 +615,7 @@ dist:   
2256Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 169-makefile-ccache_needs_quotes.patch
2257diff -r WNDR4300v2-basecompare/package/openssl/patches/170-bash_path.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/170-bash_path.patch
22581,4c1,2
2259< Index: openssl-0.9.8e/util/domd
2260< ===================================================================
2261< --- openssl-0.9.8e.orig/util/domd	2007-06-04 13:23:32.408807008 +0200
2262< +++ openssl-0.9.8e/util/domd	2007-06-04 13:23:33.442649840 +0200
2263---
2264> --- a/util/domd
2265> +++ b/util/domd
2266Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches: 190-remove_timestamp_check.patch
2267Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 200-ocf-20080917.patch
2268Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches: 200-ocf-20100325.patch
2269diff -r WNDR4300v2-basecompare/package/openssl/patches/300-etrax_support.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/openssl/patches/300-etrax_support.patch
22701,6c1,5
2271< diff -urN openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
2272< --- openssl-0.9.8h.orig/Configure	2008-05-02 01:11:30.000000000 +0200
2273< +++ openssl-0.9.8h/Configure	2008-06-19 13:27:42.000000000 +0200
2274< @@ -389,6 +389,10 @@
2275<  "qnx4",	"cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
2276<  "qnx6",	"cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",
2277---
2278> --- a/Configure
2279> +++ b/Configure
2280> @@ -403,6 +403,10 @@ my %table=(
2281>  "QNX6",       "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
2282>  "QNX6-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
2283Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 900-CVE-2009-1377.patch
2284Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 900-CVE-2009-1378.patch
2285Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 900-CVE-2009-1379.patch
2286Seulement dans WNDR4300v2-basecompare/package/openssl/patches: 901-remove_rej.patch
2287Seulement dans WNDR4300v2-basecompare/package: opkg
2288Seulement dans WNDR4300v2-basecompare/package: pcmcia-cs
2289Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: phddns
2290Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: pot
2291Seulement dans WNDR4300v2-basecompare/package: ppp
2292Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ppp-nas
2293Seulement dans WNDR4300v2-basecompare/package: pptp
2294Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: proccgi
2295Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: proftpd
2296Seulement dans WNDR4300v2-basecompare/package: ps3-utils
2297Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: px5g
2298Seulement dans WNDR4300v2-basecompare/package: qos-scripts
2299Seulement dans WNDR4300v2-basecompare/package: r8101
2300Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: radvd
2301Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: realpath
2302Seulement dans WNDR4300v2-basecompare/package: robocfg
2303Seulement dans WNDR4300v2-basecompare/package: rt2570
2304Seulement dans WNDR4300v2-basecompare/package: rtc-rv5c386a
2305Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: samba
2306Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: samba-scripts
2307Seulement dans WNDR4300v2-basecompare/package: siit
2308Seulement dans WNDR4300v2-basecompare/package: spidev_test
2309Seulement dans WNDR4300v2-basecompare/package: spi-ks8995
2310Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: sqlite3
2311Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: ssmtp
2312Seulement dans WNDR4300v2-basecompare/package: swconfig
2313Seulement dans WNDR4300v2-basecompare/package: switch
2314Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: tcpdump
2315Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: telnetenable
2316Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: trafficmeter
2317Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: transmission
2318Seulement dans WNDR4300v2-basecompare/package: uboot-envtools
2319Seulement dans WNDR4300v2-basecompare/package: uboot-ifxmips
2320Seulement dans WNDR4300v2-basecompare/package: ubsec_ssb
2321diff -r WNDR4300v2-basecompare/package/udev/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/udev/Makefile
23221,2c1,2
2323< #
2324< # Copyright (C) 2006-2008 OpenWrt.org
2325---
2326> # 
2327> # Copyright (C) 2006 OpenWrt.org
23286a7
2329> # $Id: Makefile 6582 2007-03-16 20:21:39Z nbd $
233011c12
2331< PKG_VERSION:=142
2332---
2333> PKG_VERSION:=106
233415,16c16,22
2335< PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/hotplug/
2336< PKG_MD5SUM:=3edc4cf383dccb06d866c5156d59ddd5
2337---
2338> PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
2339> 	http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
2340> 	ftp://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \
2341> 	http://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \
2342> 	ftp://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/ \
2343> 	http://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/
2344> PKG_MD5SUM:=320ccd2d0f4540d10e021bafa14f8985
234520,21d25
2346< PKG_INSTALL=1
2347< 
234823,24c27,28
2349<   SECTION:=base
2350<   CATEGORY:=Base system
2351---
2352>   SECTION:=utils
2353>   CATEGORY:=Utilities
235428d31
2355<   MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com>
235631,33c34,36
2357< define Package/udev/description
2358< 	udev allows Linux users to have a dynamic /dev directory and it
2359< 	provides the ability to have persistent device names.
2360---
2361> define Package/udevtrigger
2362>   $(call Package/udev)
2363>   TITLE:=Small utility to request kernel devices events for coldplug
236436,37c39,51
2365< define Package/udev/config
2366< 	source "$(SOURCE)/udev-config.in"
2367---
2368> define Build/Compile
2369> 	$(MAKE) -C $(PKG_BUILD_DIR) \
2370> 		CROSS_COMPILE="$(TARGET_CROSS)" \
2371> 		STRIP="/bin/true" \
2372> 		OPTFLAGS="$(TARGET_CFLAGS)" \
2373> 		DESTDIR="$(PKG_INSTALL_DIR)" \
2374> 		INSTALL="install -c" \
2375> 		all install
2376> 	$(MAKE) -C $(PKG_BUILD_DIR) \
2377> 		CROSS_COMPILE="$(TARGET_CROSS)" \
2378> 		OPTFLAGS="$(TARGET_CFLAGS)" \
2379> 		CC="$(TARGET_CROSS)gcc" \
2380> 		EXTRAS="extras/volume_id"
238140,76d53
2382< udev-args-$(CONFIG_UDEV_DISABLE_LOGGING) += --disable-logging
2383< udev-args-$(CONFIG_UDEV_ENABLE_DEBUG) += --enable-debug
2384< 
2385< CONFIGURE_ARGS += --prefix=/usr --exec-prefix= --sysconfdir=/etc \
2386< 	--sbindir=/sbin $(udev-args-y)
2387< 
2388< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_ata_id) += ata_id
2389< 
2390< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_cdrom_id) += cdrom_id
2391< udev-extra-rules-$(CONFIG_UDEV_EXTRA_cdrom_id) += 60-cdrom_id.rules
2392< 
2393< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_collect) += collect
2394< 
2395< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_edd_id) += edd_id
2396< udev-extra-rules-$(CONFIG_UDEV_EXTRA_edd_id) += 61-persistent-storage-edd.rules
2397< 
2398< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_firmware) += firmware.sh
2399< udev-extra-rules-$(CONFIG_UDEV_EXTRA_firmware) += 50-firmware.rules
2400< 
2401< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_floppy) += create_floppy_devices
2402< 
2403< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_fstab_import) += fstab_import
2404< udev-extra-rules-$(CONFIG_UDEV_EXTRA_fstab_import) += 79-fstab_import.rules
2405< 
2406< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_path_id) += path_id
2407< 
2408< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_rule_generator) += \
2409< 	write_cd_rules write_net_rules
2410< udev-extra-lib-data-$(CONFIG_UDEV_EXTRA_rule_generator) += \
2411< 	rule_generator.functions
2412< udev-extra-rules-$(CONFIG_UDEV_EXTRA_rule_generator) += \
2413< 	75-cd-aliases-generator.rules 75-persistent-net-generator.rules
2414< 
2415< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_scsi_id) += scsi_id
2416< 
2417< udev-extra-lib-bin-$(CONFIG_UDEV_EXTRA_usb_id) += usb_id
2418< 
241978,79c55,70
2420< 	$(INSTALL_DIR) $(1)/etc/udev/rules.d
2421< 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/udev/udev.conf $(1)/etc/udev
2422---
2423> 	#install -d -m0775 $(1)/etc/udev
2424> 	#$(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/
2425> 	#install -d -m0775 $(1)/lib/udev
2426> 	#install -d -m0775 $(1)/sbin/
2427> 	#$(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/
2428> 	#$(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/
2429> 	#install -d -m0775 $(1)/usr/bin/
2430> 	#$(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/
2431> 	#$(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/
2432> 	#install -d -m0775 $(1)/usr/sbin/
2433> 	#$(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/
2434> 	install -d -m0775 $(1)/usr/lib
2435> 	$(CP) $(PKG_BUILD_DIR)/extras/volume_id/lib/libvolume_id.so.* $(1)/usr/lib/
2436> 	install -d -m0775 $(1)/usr/sbin
2437> 	$(CP) $(PKG_BUILD_DIR)/extras/volume_id/vol_id $(1)/usr/sbin/
2438> endef
243980a72
2440> define Package/udevtrigger/install
244182,117c74
2442< 	$(INSTALL_BIN) \
2443< 		$(PKG_INSTALL_DIR)/sbin/udevadm \
2444< 		$(PKG_INSTALL_DIR)/sbin/udevd \
2445< 		$(1)/sbin
2446< 
2447< 	$(INSTALL_DIR) $(1)/lib/udev/rules.d
2448< 	$(INSTALL_DATA) \
2449< 		$(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
2450< 			$(udev-extra-rules-y)) \
2451< 		$(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
2452< 			50-udev-default.rules \
2453< 			60-persistent-input.rules \
2454< 			60-persistent-serial.rules \
2455< 			60-persistent-storage.rules \
2456< 			80-drivers.rules \
2457< 			95-udev-late.rules) \
2458< 		$(1)/lib/udev/rules.d
2459< 
2460< 	$(INSTALL_DIR) $(1)/lib
2461< 	$(INSTALL_BIN) \
2462< 		$(PKG_INSTALL_DIR)/lib/libudev.so.* \
2463< 		$(1)/lib
2464< 
2465< 	$(INSTALL_DIR) $(1)/lib/udev
2466< ifneq ($(udev-extra-lib-bin-y),)
2467< 		$(INSTALL_BIN) \
2468< 			$(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \
2469< 				$(udev-extra-lib-bin-y)) \
2470< 			$(1)/lib/udev/
2471< endif
2472< ifneq ($(udev-extra-lib-data-y),)
2473< 		$(INSTALL_DATA) \
2474< 			$(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \
2475< 				$(udev-extra-lib-data-y)) \
2476< 			$(1)/lib/udev/
2477< endif
2478---
2479> 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevtrigger $(1)/sbin/
2480120a78
2481> $(eval $(call BuildPackage,udevtrigger))
2482Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/udev: patches
2483Seulement dans WNDR4300v2-basecompare/package/udev: udev-config.in
2484Seulement dans WNDR4300v2-basecompare/package: udevtrigger
2485Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: udhcp
2486Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: uhttpd
2487Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: usb-modeswitch
2488Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: utelnetd
2489Seulement dans WNDR4300v2-basecompare/package: util-linux-ng
2490Seulement dans WNDR4300v2-basecompare/package: w1-gpio-custom
2491Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: wget
2492Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: wide-dhcpv6
2493Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/wireless-tools: Config.in
2494diff -r WNDR4300v2-basecompare/package/wireless-tools/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/wireless-tools/Makefile
249551a52,59
2496> define Package/wireless-tools/config
2497>   source "$(SOURCE)/Config.in"
2498> endef
2499> 
2500> ifdef CONFIG_WIRELESS_TOOLS_ANY_SSID_HACK
2501>   COMMON_CFLAGS += "-DSTR_ANY_SSID_HACK"
2502> endif
2503> 
250457c65
2505< 		CFLAGS="$(TARGET_CFLAGS) -I." \
2506---
2507> 		CFLAGS="$(TARGET_CFLAGS) $(COMMON_CFLAGS) -I." \
2508diff -r WNDR4300v2-basecompare/package/wireless-tools/patches/003-we_essential_def.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/wireless-tools/patches/003-we_essential_def.patch
2509105a106,121
2510> @@ -995,6 +995,7 @@ set_enc_info(int		skfd,
2511>    return(i);
2512>  }
2513>  
2514> +#ifndef WE_ESSENTIAL
2515>  /*------------------------------------------------------------------*/
2516>  /*
2517>   * Set Power Management
2518> @@ -1111,7 +1112,6 @@ set_power_info(int		skfd,
2519>    return(i);
2520>  }
2521>  
2522> -#ifndef WE_ESSENTIAL
2523>  /*------------------------------------------------------------------*/
2524>  /*
2525>   * Set Nickname
2526138c154,162
2527< @@ -1719,21 +1723,21 @@ static const struct iwconfig_entry iwcon
2528---
2529> @@ -1712,28 +1716,28 @@ static const struct iwconfig_entry iwcon
2530>  	"Set Encode",			"{NNNN-NNNN|off}" },
2531>    { "key",		set_enc_info,		1,	SIOCSIWENCODE,
2532>  	"Set Encode",			"{NNNN-NNNN|off}"  },
2533> +#ifndef WE_ESSENTIAL
2534>    { "power",		set_power_info,		1,	SIOCSIWPOWER,
2535>  	"Set Power Management",		"{period N|timeout N|saving N|off}" },
2536> -#ifndef WE_ESSENTIAL
2537>    { "nickname",		set_nick_info,		1,	SIOCSIWNICKN,
2538Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/wireless-tools/patches: 004-dni-anyssid-hack.patch
2539Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package/wireless-tools/patches: 005-let-essid-show-correct-with-max-length.patch
2540Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: wlan-common
2541Seulement dans WNDR4300v2-basecompare/package: wpa_supplicant
2542Seulement dans WNDR4300v2-basecompare/package: wprobe
2543Seulement dans WNDR4300v2-basecompare/package: wrt55agv2-spidevs
2544Seulement dans WNDR4300v2-basecompare/package: yamonenv
2545Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: zebra
2546Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/package: zip
2547Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src: README.build
2548Seulement dans WNDR4300v2-basecompare/scripts/config: lxdialog
2549diff -r WNDR4300v2-basecompare/scripts/metadata.pl WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/scripts/metadata.pl
255057a58,59
2551> 		/^Linux-Treeish:\s*(.+)\s*$/ and $target->{linuxtreeish} = $1;
2552> 		/^Netfilter-Treeish:\s*(.+)\s*$/ and $target->{ntreeish} = $1;
255358a61
2554> 		/^Customer:\s*(.+)\s*$/ and $target->{customer} = $1;
2555228,230c231
2556< 	}
2557< 
2558< 	if ($target->{arch} =~ /\w/) {
2559---
2560> 	} else {
2561231a233,247
2562> 		foreach my $dep (@{$target->{depends}}) {
2563> 			my $mode = "depends";
2564> 			my $flags;
2565> 			my $name;
2566> 
2567> 			$dep =~ /^([@\+\-]+)(.+)$/;
2568> 			$flags = $1;
2569> 			$name = $2;
2570> 
2571> 			next if $name =~ /:/;
2572> 			$flags =~ /-/ and $mode = "deselect";
2573> 			$flags =~ /\+/ and $mode = "select";
2574> 			$flags =~ /@/ and $confstr .= "\t$mode $name\n";
2575> 		}
2576> 		$confstr .= $features;
2577233,247c249
2578< 	foreach my $dep (@{$target->{depends}}) {
2579< 		my $mode = "depends";
2580< 		my $flags;
2581< 		my $name;
2582< 
2583< 		$dep =~ /^([@\+\-]+)(.+)$/;
2584< 		$flags = $1;
2585< 		$name = $2;
2586< 
2587< 		next if $name =~ /:/;
2588< 		$flags =~ /-/ and $mode = "deselect";
2589< 		$flags =~ /\+/ and $mode = "select";
2590< 		$flags =~ /@/ and $confstr .= "\t$mode $name\n";
2591< 	}
2592< 	$confstr .= $features;
2593---
2594> 
2595551a554,555
2596> 		help
2597> $feature->{description}
2598553,555d556
2599< 			$feature->{description} =~ /\w/ and do {
2600< 				print "\t\thelp\n".$feature->{description}."\n";
2601< 			};
2602624,626d624
2603< 			if ($pkg->{variant}) {
2604< 				print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
2605< 			}
2606758a757
2607> 	mkdir -p \$(TARGET_DIR)/etc/uci-defaults
2608diff -r WNDR4300v2-basecompare/scripts/metadata.pm WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/scripts/metadata.pm
2609115d114
2610< 		/^Build-Variant: \s*(\w+)\s*/ and $pkg->{variant} = $1;
2611Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/scripts: mkuImage.sh
2612Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/scripts: update-alternatives
2613diff -r WNDR4300v2-basecompare/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c
2614641c641
2615< 		dev_name(hcd->self.controller),
2616---
2617> 		hcd->self.controller->bus_id,
2618diff -r WNDR4300v2-basecompare/target/linux/adm5120/router_be/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/adm5120/router_be/config-2.6.28
26192a3
2620> CONFIG_ADM5120=y
262117d17
2622< CONFIG_ADM5120=y
262325a26
2624> CONFIG_BASE_SMALL=0
262538a40
2626> CONFIG_CPU_MIPS32=y
262741d42
2628< CONFIG_CPU_MIPS32=y
262973d73
2630< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
263174a75
2632> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
263389d89
2634< CONFIG_HID_COMPAT=y
263590a91
2636> CONFIG_HID_COMPAT=y
263794d94
2638< # CONFIG_HZ_100 is not set
263995a96
2640> # CONFIG_HZ_100 is not set
264196a98
2642> # CONFIG_I2C is not set
264399d100
2644< CONFIG_INOTIFY_USER=y
2645101c102
2646< # CONFIG_INPUT_GPIO_BUTTONS is not set
2647---
2648> CONFIG_INOTIFY_USER=y
2649102a104
2650> # CONFIG_INPUT_GPIO_BUTTONS is not set
2651108d109
2652< CONFIG_LEGACY_PTY_COUNT=256
2653109a111
2654> CONFIG_LEGACY_PTY_COUNT=256
2655119a122
2656> CONFIG_MIPS=y
2657129d131
2658< CONFIG_MIPS=y
2659142a145
2660> CONFIG_PCI=y
2661144a148
2662> # CONFIG_PCSPKR_PLATFORM is not set
2663152a157
2664> CONFIG_SERIAL_AMBA_PL010=y
2665156d160
2666< CONFIG_SERIAL_AMBA_PL010=y
2667157a162
2668> CONFIG_SERIO=y
2669164d168
2670< CONFIG_SERIO=y
2671186a191
2672> CONFIG_TICK_ONESHOT=y
2673188a194
2674> CONFIG_USB=m
2675192d197
2676< CONFIG_USB=m
2677diff -r WNDR4300v2-basecompare/target/linux/adm5120/router_be/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/adm5120/router_be/config-2.6.30
26782a3
2679> CONFIG_ADM5120=y
268017d17
2681< CONFIG_ADM5120=y
268225a26
2683> CONFIG_BASE_SMALL=0
268433d33
2685< CONFIG_CEVT_R4K_LIB=y
268634a35
2687> CONFIG_CEVT_R4K_LIB=y
268842a44
2689> CONFIG_CPU_MIPS32=y
269045d46
2691< CONFIG_CPU_MIPS32=y
269267d67
2693< CONFIG_CSRC_R4K_LIB=y
269468a69
2695> CONFIG_CSRC_R4K_LIB=y
269679d79
2697< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
269880a81
2699> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
2700101d101
2701< # CONFIG_HZ_100 is not set
2702102a103
2703> # CONFIG_HZ_100 is not set
2704103a105
2705> # CONFIG_I2C is not set
2706105d106
2707< CONFIG_INOTIFY_USER=y
2708107c108
2709< # CONFIG_INPUT_GPIO_BUTTONS is not set
2710---
2711> CONFIG_INOTIFY_USER=y
2712108a110
2713> # CONFIG_INPUT_GPIO_BUTTONS is not set
2714114d115
2715< CONFIG_LEGACY_PTY_COUNT=256
2716115a117
2717> CONFIG_LEGACY_PTY_COUNT=256
2718124a127
2719> CONFIG_MIPS=y
2720134d136
2721< CONFIG_MIPS=y
2722147a150
2723> CONFIG_PCI=y
2724149a153
2725> # CONFIG_PCSPKR_PLATFORM is not set
2726157a162
2727> CONFIG_SERIAL_AMBA_PL010=y
2728161d165
2729< CONFIG_SERIAL_AMBA_PL010=y
2730162a167
2731> CONFIG_SERIO=y
2732169d173
2733< CONFIG_SERIO=y
2734192a197
2735> CONFIG_TICK_ONESHOT=y
2736195a201
2737> CONFIG_USB=m
2738199d204
2739< CONFIG_USB=m
2740diff -r WNDR4300v2-basecompare/target/linux/adm5120/router_be/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/adm5120/router_be/config-2.6.31
27412a3
2742> CONFIG_ADM5120=y
274317d17
2744< CONFIG_ADM5120=y
274528a29
2746> CONFIG_BASE_SMALL=0
274735d35
2748< CONFIG_CEVT_R4K_LIB=y
274936a37
2750> CONFIG_CEVT_R4K_LIB=y
275144a46
2752> CONFIG_CPU_MIPS32=y
275347d48
2754< CONFIG_CPU_MIPS32=y
275569d69
2756< CONFIG_CSRC_R4K_LIB=y
275770a71
2758> CONFIG_CSRC_R4K_LIB=y
275981d81
2760< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
276182a83
2762> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
2763103d103
2764< # CONFIG_HZ_100 is not set
2765104a105
2766> # CONFIG_HZ_100 is not set
2767105a107
2768> # CONFIG_I2C is not set
2769107d108
2770< CONFIG_INOTIFY_USER=y
2771109c110
2772< # CONFIG_INPUT_GPIO_BUTTONS is not set
2773---
2774> CONFIG_INOTIFY_USER=y
2775110a112
2776> # CONFIG_INPUT_GPIO_BUTTONS is not set
2777116d117
2778< CONFIG_LEGACY_PTY_COUNT=256
2779117a119
2780> CONFIG_LEGACY_PTY_COUNT=256
2781127a130
2782> CONFIG_MIPS=y
2783137d139
2784< CONFIG_MIPS=y
2785151a154
2786> CONFIG_PCI=y
2787153a157
2788> # CONFIG_PCSPKR_PLATFORM is not set
2789161a166
2790> CONFIG_SERIAL_AMBA_PL010=y
2791165d169
2792< CONFIG_SERIAL_AMBA_PL010=y
2793166a171
2794> CONFIG_SERIO=y
2795173d177
2796< CONFIG_SERIO=y
2797195a200
2798> CONFIG_TICK_ONESHOT=y
2799197a203
2800> CONFIG_USB=m
2801201d206
2802< CONFIG_USB=m
2803diff -r WNDR4300v2-basecompare/target/linux/adm5120/router_le/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/adm5120/router_le/config-2.6.28
28043a4
2805> CONFIG_ADM5120=y
28066d6
2807< CONFIG_ADM5120_MACH_BR_6104KP=y
28087a8
2809> CONFIG_ADM5120_MACH_BR_6104KP=y
281019d19
2811< CONFIG_ADM5120_MACH_RB_133C=y
281220a21
2813> CONFIG_ADM5120_MACH_RB_133C=y
281435d35
2815< CONFIG_ADM5120=y
281644a45,48
2817> # CONFIG_ATA_NONSTANDARD is not set
2818> # CONFIG_ATA_PIIX is not set
2819> CONFIG_ATA_SFF=y
2820> CONFIG_BASE_SMALL=0
282156a61
2822> CONFIG_CPU_MIPS32=y
282359d63
2824< CONFIG_CPU_MIPS32=y
282582d85
2826< CONFIG_CRYPTO_ALGAPI2=m
282783a87
2828> CONFIG_CRYPTO_ALGAPI2=m
282985d88
2830< CONFIG_CRYPTO_BLKCIPHER2=m
283186a90
2832> CONFIG_CRYPTO_BLKCIPHER2=m
283389d92
2834< CONFIG_CRYPTO_MANAGER2=m
283590a94
2836> CONFIG_CRYPTO_MANAGER2=m
2837102d105
2838< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
2839103a107
2840> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
2841119d122
2842< CONFIG_HID_COMPAT=y
2843120a124
2844> CONFIG_HID_COMPAT=y
2845122,123d125
2846< # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
2847< CONFIG_HOSTAP_FIRMWARE=y
2848124a127,128
2849> CONFIG_HOSTAP_FIRMWARE=y
2850> # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
2851128d131
2852< # CONFIG_HZ_100 is not set
2853129a133
2854> # CONFIG_HZ_100 is not set
2855130a135
2856> # CONFIG_I2C is not set
2857132d136
2858< CONFIG_IEEE80211_CRYPT_WEP=m
2859133a138
2860> CONFIG_IEEE80211_CRYPT_WEP=m
2861136d140
2862< CONFIG_INOTIFY_USER=y
2863138c142
2864< # CONFIG_INPUT_GPIO_BUTTONS is not set
2865---
2866> CONFIG_INOTIFY_USER=y
2867139a144
2868> # CONFIG_INPUT_GPIO_BUTTONS is not set
2869146d150
2870< CONFIG_LEGACY_PTY_COUNT=256
2871147a152
2872> CONFIG_LEGACY_PTY_COUNT=256
2873157a163
2874> CONFIG_MIPS=y
2875167d172
2876< CONFIG_MIPS=y
2877175d179
2878< CONFIG_MTD_NAND_PLATFORM=y
2879176a181
2880> CONFIG_MTD_NAND_PLATFORM=y
2881177a183
2882> # CONFIG_NATSEMI is not set
2883184a191
2884> CONFIG_PCI=y
2885186a194
2886> # CONFIG_PCSPKR_PLATFORM is not set
2887195a204
2888> CONFIG_SERIAL_AMBA_PL010=y
2889199d207
2890< CONFIG_SERIAL_AMBA_PL010=y
2891200a209
2892> CONFIG_SERIO=y
2893207d215
2894< CONFIG_SERIO=y
2895230a239
2896> CONFIG_TICK_ONESHOT=y
2897232a242
2898> CONFIG_USB=m
2899235d244
2900< CONFIG_USB=m
2901diff -r WNDR4300v2-basecompare/target/linux/adm5120/router_le/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/adm5120/router_le/config-2.6.30
29022a3
2903> CONFIG_ADM5120=y
29045d5
2905< CONFIG_ADM5120_MACH_BR_6104KP=y
29066a7
2907> CONFIG_ADM5120_MACH_BR_6104KP=y
290818d18
2909< CONFIG_ADM5120_MACH_RB_133C=y
291019a20
2911> CONFIG_ADM5120_MACH_RB_133C=y
291234d34
2913< CONFIG_ADM5120=y
291443a44,47
2915> # CONFIG_ATA_NONSTANDARD is not set
2916> # CONFIG_ATA_PIIX is not set
2917> CONFIG_ATA_SFF=y
2918> CONFIG_BASE_SMALL=0
291950d53
2920< CONFIG_CEVT_R4K_LIB=y
292151a55
2922> CONFIG_CEVT_R4K_LIB=y
292359a64
2924> CONFIG_CPU_MIPS32=y
292562d66
2926< CONFIG_CPU_MIPS32=y
292787d90
2928< CONFIG_CRYPTO_BLKCIPHER2=y
292988a92
2930> CONFIG_CRYPTO_BLKCIPHER2=y
293190d93
2932< CONFIG_CRYPTO_HASH2=y
293392c95
2934< CONFIG_CRYPTO_MANAGER2=y
2935---
2936> CONFIG_CRYPTO_HASH2=y
293793a97
2938> CONFIG_CRYPTO_MANAGER2=y
293997d100
2940< CONFIG_CSRC_R4K_LIB=y
294198a102
2942> CONFIG_CSRC_R4K_LIB=y
2943109d112
2944< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
2945110a114
2946> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
2947130,131d133
2948< # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
2949< CONFIG_HOSTAP_FIRMWARE=y
2950132a135,136
2951> CONFIG_HOSTAP_FIRMWARE=y
2952> # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
2953136d139
2954< # CONFIG_HZ_100 is not set
2955137a141
2956> # CONFIG_HZ_100 is not set
2957138a143
2958> # CONFIG_I2C is not set
2959141d145
2960< CONFIG_INOTIFY_USER=y
2961143c147
2962< # CONFIG_INPUT_GPIO_BUTTONS is not set
2963---
2964> CONFIG_INOTIFY_USER=y
2965144a149
2966> # CONFIG_INPUT_GPIO_BUTTONS is not set
2967151d155
2968< CONFIG_LEGACY_PTY_COUNT=256
2969152a157
2970> CONFIG_LEGACY_PTY_COUNT=256
2971153a159
2972> CONFIG_LIB80211=m
2973157d162
2974< CONFIG_LIB80211=m
2975165a171
2976> CONFIG_MIPS=y
2977175d180
2978< CONFIG_MIPS=y
2979183d187
2980< CONFIG_MTD_NAND_PLATFORM=y
2981184a189
2982> CONFIG_MTD_NAND_PLATFORM=y
2983185a191
2984> # CONFIG_NATSEMI is not set
2985192a199
2986> CONFIG_PCI=y
2987194a202
2988> # CONFIG_PCSPKR_PLATFORM is not set
2989202a211
2990> CONFIG_SERIAL_AMBA_PL010=y
2991206d214
2992< CONFIG_SERIAL_AMBA_PL010=y
2993207a216
2994> CONFIG_SERIO=y
2995214d222
2996< CONFIG_SERIO=y
2997238a247
2998> CONFIG_TICK_ONESHOT=y
2999241a251
3000> CONFIG_USB=m
3001244d253
3002< CONFIG_USB=m
3003diff -r WNDR4300v2-basecompare/target/linux/adm5120/router_le/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/adm5120/router_le/config-2.6.31
30042a3
3005> CONFIG_ADM5120=y
30065d5
3007< CONFIG_ADM5120_MACH_BR_6104KP=y
30086a7
3009> CONFIG_ADM5120_MACH_BR_6104KP=y
301018d18
3011< CONFIG_ADM5120_MACH_RB_133C=y
301219a20
3013> CONFIG_ADM5120_MACH_RB_133C=y
301434d34
3015< CONFIG_ADM5120=y
301646a47,49
3017> # CONFIG_ATA_NONSTANDARD is not set
3018> # CONFIG_ATA_PIIX is not set
3019> CONFIG_BASE_SMALL=0
302052d54
3021< CONFIG_CEVT_R4K_LIB=y
302253a56
3023> CONFIG_CEVT_R4K_LIB=y
302461a65
3025> CONFIG_CPU_MIPS32=y
302664d67
3027< CONFIG_CPU_MIPS32=y
302889d91
3029< CONFIG_CRYPTO_BLKCIPHER2=y
303090a93
3031> CONFIG_CRYPTO_BLKCIPHER2=y
303292d94
3033< CONFIG_CRYPTO_HASH2=y
303494c96
3035< CONFIG_CRYPTO_MANAGER2=y
3036---
3037> CONFIG_CRYPTO_HASH2=y
303895a98
3039> CONFIG_CRYPTO_MANAGER2=y
304099d101
3041< CONFIG_CSRC_R4K_LIB=y
3042100a103
3043> CONFIG_CSRC_R4K_LIB=y
3044111d113
3045< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
3046112a115
3047> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
3048132,133d134
3049< # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
3050< CONFIG_HOSTAP_FIRMWARE=y
3051134a136,137
3052> CONFIG_HOSTAP_FIRMWARE=y
3053> # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
3054138d140
3055< # CONFIG_HZ_100 is not set
3056139a142
3057> # CONFIG_HZ_100 is not set
3058140a144
3059> # CONFIG_I2C is not set
3060143d146
3061< CONFIG_INOTIFY_USER=y
3062145c148
3063< # CONFIG_INPUT_GPIO_BUTTONS is not set
3064---
3065> CONFIG_INOTIFY_USER=y
3066146a150
3067> # CONFIG_INPUT_GPIO_BUTTONS is not set
3068153d156
3069< CONFIG_LEGACY_PTY_COUNT=256
3070154a158
3071> CONFIG_LEGACY_PTY_COUNT=256
3072155a160
3073> CONFIG_LIB80211=m
3074159d163
3075< CONFIG_LIB80211=m
3076168a173
3077> CONFIG_MIPS=y
3078178d182
3079< CONFIG_MIPS=y
3080186d189
3081< CONFIG_MTD_NAND_PLATFORM=y
3082187a191
3083> CONFIG_MTD_NAND_PLATFORM=y
3084188a193
3085> # CONFIG_NATSEMI is not set
3086196a202
3087> CONFIG_PCI=y
3088198a205
3089> # CONFIG_PCSPKR_PLATFORM is not set
3090206a214
3091> CONFIG_SERIAL_AMBA_PL010=y
3092210d217
3093< CONFIG_SERIAL_AMBA_PL010=y
3094211a219
3095> CONFIG_SERIO=y
3096218d225
3097< CONFIG_SERIO=y
3098241a249
3099> CONFIG_TICK_ONESHOT=y
3100243a252
3101> CONFIG_USB=m
3102246d254
3103< CONFIG_USB=m
3104diff -r WNDR4300v2-basecompare/target/linux/amazon/config-2.6.21 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/amazon/config-2.6.21
31054a5
3106> CONFIG_AMAZON=y
310710d10
3108< CONFIG_AMAZON=y
310912a13
3110> CONFIG_BASE_SMALL=0
311119a21
3112> CONFIG_CPU_MIPS32=y
311322d23
3114< CONFIG_CPU_MIPS32=y
311556a58
3116> # CONFIG_I2C is not set
311760d61
3118< # CONFIG_KALLSYMS_EXTRA_PASS is not set
311961a63
3120> # CONFIG_KALLSYMS_EXTRA_PASS is not set
312164a67
3122> CONFIG_MIPS=y
312374d76
3124< # CONFIG_MIPS_FPU_EMU is not set
312577a80
3126> # CONFIG_MIPS_MTX1 is not set
312781d83
3128< # CONFIG_MIPS_MTX1 is not set
312991d92
3130< CONFIG_MIPS=y
313192a94
3132> # CONFIG_MOMENCO_OCELOT is not set
313396d97
3134< # CONFIG_MOMENCO_OCELOT is not set
3135107a109
3136> CONFIG_MTD_PHYSMAP=y
3137111d112
3138< CONFIG_MTD_PHYSMAP=y
3139113d113
3140< # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
3141114a115
3142> # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
3143Seulement dans WNDR4300v2-basecompare/target/linux/amazon: profiles
3144Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar7: config-2.6.27
3145diff -r WNDR4300v2-basecompare/target/linux/ar7/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar7/config-default
31461d0
3147< 
31483a3
3149> CONFIG_AR7=y
31506d5
3151< CONFIG_AR7=y
315212a12
3153> CONFIG_BASE_SMALL=0
315419d18
3155< CONFIG_CEVT_R4K_LIB=y
315620a20
3157> CONFIG_CEVT_R4K_LIB=y
315829a30
3159> CONFIG_CPU_MIPS32=y
316032d32
3161< CONFIG_CPU_MIPS32=y
316254d53
3163< CONFIG_CSRC_R4K_LIB=y
316455a55
3165> CONFIG_CSRC_R4K_LIB=y
316662d61
3167< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
316863a63
3169> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
317078a79
3171> # CONFIG_I2C is not set
317291a93
3173> CONFIG_MIPS=y
3174101d102
3175< CONFIG_MIPS=y
3176110c111
3177< # CONFIG_PCI is not set
3178---
3179> # CONFIG_PCSPKR_PLATFORM is not set
3180116a118
3181> 
3182139a142
3183> CONFIG_TICK_ONESHOT=y
3184Le fichier WNDR4300v2-basecompare/target/linux/ar7/files/arch/mips/include/asm/ar7 est un fichier régulier alors que le fichier WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar7/files/arch/mips/include/asm/ar7 est un répertoire
3185Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar7: patches-2.6.27
3186Seulement dans WNDR4300v2-basecompare/target/linux/ar71xx/base-files/etc/defconfig: wndr3700
3187diff -r WNDR4300v2-basecompare/target/linux/ar71xx/base-files/etc/diag.sh WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/base-files/etc/diag.sh
318842c42
3189< 	bullet-m | rocket-m | nano-m)
3190---
3191> 	bullet-m)
319268,70d67
3193< 		;;
3194< 	wndr3700)
3195< 		status_led="wndr3700:green:power"
3196diff -r WNDR4300v2-basecompare/target/linux/ar71xx/base-files/lib/ar71xx.sh WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/base-files/lib/ar71xx.sh
319725,27d24
3198< 	*"Nanostation M")
3199< 		name="nanostation-m"
3200< 		;;
320155,57d51
3202< 	*"Rocket M")
3203< 		name="rocket-m"
3204< 		;;
320575,77d68
3206< 		;;
3207< 	*WNDR3700)
3208< 		name="wndr3700"
3209diff -r WNDR4300v2-basecompare/target/linux/ar71xx/base-files/lib/upgrade/platform.sh WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
321010,63d9
3211< CI_BLKSZ=65536
3212< CI_LDADR=0x80060000
3213< 
3214< platform_find_partitions() {
3215< 	local first dev size erasesize name
3216< 	while read dev size erasesize name; do
3217< 		name=${name#'"'}; name=${name%'"'}
3218< 		case "$name" in
3219< 			vmlinux.bin.l7|kernel|linux|rootfs)
3220< 				if [ -z "$first" ]; then
3221< 					first="$name"
3222< 				else
3223< 					echo "$erasesize:$first:$name"
3224< 					break
3225< 				fi
3226< 			;;
3227< 		esac
3228< 	done < /proc/mtd
3229< }
3230< 
3231< platform_find_kernelpart() {
3232< 	local part
3233< 	for part in "${1%:*}" "${1#*:}"; do
3234< 		case "$part" in
3235< 			vmlinux.bin.l7|kernel|linux)
3236< 				echo "$part"
3237< 				break
3238< 			;;
3239< 		esac
3240< 	done
3241< }
3242< 
3243< platform_do_upgrade_combined() {
3244< 	local partitions=$(platform_find_partitions)
3245< 	local kernelpart=$(platform_find_kernelpart "${partitions#*:}")
3246< 	local erase_size=$((0x${partitions%%:*})); partitions="${partitions#*:}"
3247< 	local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null)
3248< 	local kern_blocks=$(($kern_length / $CI_BLKSZ))
3249< 	local root_blocks=$((0x$(dd if="$1" bs=2 skip=5 count=4 2>/dev/null) / $CI_BLKSZ))
3250< 
3251< 	if [ -n "$partitions" ] && [ -n "$kernelpart" ] && \
3252< 	   [ ${kern_blocks:-0} -gt 0 ] && \
3253< 	   [ ${root_blocks:-0} -gt ${kern_blocks:-0} ] && \
3254< 	   [ ${erase_size:-0} -gt 0 ];
3255< 	then
3256< 		local append=""
3257< 		[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
3258< 
3259< 		( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \
3260< 		  dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null ) | \
3261< 			mtd -r $append -F$kernelpart:$kern_length:$CI_LDADR,rootfs write - $partitions
3262< 	fi
3263< }
3264< 
326571c17
3266< 	ap83 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt-400n | bullet-m | nano-m | rocket-m)
3267---
3268> 	ap83 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt-400n)
326985,91d30
3270< 	wndr3700)
3271< 		[ "$magic" != "3337" ] && {
3272< 			echo "Invalid image type."
3273< 			return 1
3274< 		}
3275< 		return 0
3276< 		;;
327799,115d37
3278< 	routerstation | routerstation-pro | ls-sr71)
3279< 		[ "$magic" != "4349" ] && {
3280< 			echo "Invalid image. Use *-sysupgrade.bin files on this board"
3281< 			return 1
3282< 		}
3283< 
3284< 		local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null)
3285< 		local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"
3286< 
3287< 		if [ -n "$md5_img" -a -n "$md5_chk" ] && [ "$md5_img" = "$md5_chk" ]; then
3288< 			return 0
3289< 		else
3290< 			echo "Invalid image. Contents do not match checksum (image:$md5_img calculated:$md5_chk)"
3291< 			return 1
3292< 		fi
3293< 		return 0
3294< 		;;
3295122,133c44
3296< platform_do_upgrade() {
3297< 	local board=$(ar71xx_board_name)
3298< 
3299< 	case "$board" in
3300< 	routerstation | routerstation-pro)
3301< 		platform_do_upgrade_combined "$ARGV"
3302< 		;;
3303< 	*)
3304< 		default_do_upgrade "$ARGV"
3305< 		;;
3306< 	esac
3307< }
3308---
3309> # use default for platform_do_upgrade()
3310diff -r WNDR4300v2-basecompare/target/linux/ar71xx/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/config-2.6.28
33113a4
3312> CONFIG_AG71XX=y
33136d6
3314< CONFIG_AG71XX=y
331520d19
3316< CONFIG_AR71XX_MACH_WNDR3700=y
331733a33
3318> CONFIG_BASE_SMALL=0
331945a46
3320> CONFIG_CPU_MIPS32=y
332148d48
3322< CONFIG_CPU_MIPS32=y
332376d75
3324< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
332577a77
3326> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
332794a95
3328> CONFIG_I2C=y
332998d98
3330< CONFIG_I2C=y
3331118a119
3332> CONFIG_MIPS=y
3333128d128
3334< CONFIG_MIPS=y
3335130d129
3336< # CONFIG_MTD_CFI_INTELEXT is not set
3337132c131
3338< CONFIG_MTD_CMDLINE_PARTS=y
3339---
3340> # CONFIG_MTD_CFI_INTELEXT is not set
3341136d134
3342< CONFIG_MTD_NAND_RB4XX=y
3343137a136
3344> CONFIG_MTD_NAND_RB4XX=y
3345141a141,142
3346> # CONFIG_NATSEMI is not set
3347> CONFIG_NET_DSA=y
3348150d150
3349< CONFIG_NET_DSA=y
3350154a155
3351> CONFIG_PCI=y
3352156a158
3353> # CONFIG_PCSPKR_PLATFORM is not set
3354183a186
3355> CONFIG_SPI=y
3356192d194
3357< CONFIG_SPI=y
3358200a203
3359> CONFIG_TICK_ONESHOT=y
3360diff -r WNDR4300v2-basecompare/target/linux/ar71xx/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/config-2.6.30
33612a3
3362> CONFIG_AG71XX=y
33635d5
3364< CONFIG_AG71XX=y
336519d18
3366< CONFIG_AR71XX_MACH_WNDR3700=y
336732a32
3368> CONFIG_BASE_SMALL=0
336939d38
3370< CONFIG_CEVT_R4K_LIB=y
337140a40
3372> CONFIG_CEVT_R4K_LIB=y
337348a49
3374> CONFIG_CPU_MIPS32=y
337551d51
3376< CONFIG_CPU_MIPS32=y
337773d72
3378< CONFIG_CSRC_R4K_LIB=y
337974a74
3380> CONFIG_CSRC_R4K_LIB=y
338181d80
3382< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
338382a82
3384> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
3385101a102
3386> CONFIG_I2C=y
3387105d105
3388< CONFIG_I2C=y
3389123a124
3390> CONFIG_MIPS=y
3391133d133
3392< CONFIG_MIPS=y
3393135d134
3394< # CONFIG_MTD_CFI_INTELEXT is not set
3395137c136
3396< CONFIG_MTD_CMDLINE_PARTS=y
3397---
3398> # CONFIG_MTD_CFI_INTELEXT is not set
3399141d139
3400< CONFIG_MTD_NAND_RB4XX=y
3401142a141
3402> CONFIG_MTD_NAND_RB4XX=y
3403146a146,147
3404> # CONFIG_NATSEMI is not set
3405> CONFIG_NET_DSA=y
3406155d155
3407< CONFIG_NET_DSA=y
3408159a160
3409> CONFIG_PCI=y
3410161a163
3411> # CONFIG_PCSPKR_PLATFORM is not set
3412188a191
3413> CONFIG_SPI=y
3414197d199
3415< CONFIG_SPI=y
3416205a208
3417> CONFIG_TICK_ONESHOT=y
3418diff -r WNDR4300v2-basecompare/target/linux/ar71xx/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/config-2.6.31
34192a3
3420> CONFIG_AG71XX=y
34215d5
3422< CONFIG_AG71XX=y
34236a7
3424> # CONFIG_AR7 is not set
342520d20
3426< CONFIG_AR71XX_MACH_WNDR3700=y
342726d25
3428< # CONFIG_AR7 is not set
342935a35
3430> CONFIG_BASE_SMALL=0
343141d40
3432< CONFIG_CEVT_R4K_LIB=y
343342a42
3434> CONFIG_CEVT_R4K_LIB=y
343550a51
3436> CONFIG_CPU_MIPS32=y
343753d53
3438< CONFIG_CPU_MIPS32=y
343975d74
3440< CONFIG_CSRC_R4K_LIB=y
344176a76
3442> CONFIG_CSRC_R4K_LIB=y
344384d83
3444< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
344585a85
3446> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
3447103a104
3448> CONFIG_I2C=y
3449107d107
3450< CONFIG_I2C=y
3451126a127
3452> CONFIG_MIPS=y
3453136d136
3454< CONFIG_MIPS=y
3455138d137
3456< # CONFIG_MTD_CFI_INTELEXT is not set
3457140c139
3458< CONFIG_MTD_CMDLINE_PARTS=y
3459---
3460> # CONFIG_MTD_CFI_INTELEXT is not set
3461144d142
3462< CONFIG_MTD_NAND_RB4XX=y
3463145a144
3464> CONFIG_MTD_NAND_RB4XX=y
3465149a149,150
3466> # CONFIG_NATSEMI is not set
3467> CONFIG_NET_DSA=y
3468158d158
3469< CONFIG_NET_DSA=y
3470162a163
3471> CONFIG_PCI=y
3472164a166
3473> # CONFIG_PCSPKR_PLATFORM is not set
3474190a193
3475> CONFIG_SPI=y
3476199d201
3477< CONFIG_SPI=y
3478207a210
3479> CONFIG_TICK_ONESHOT=y
3480diff -r WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
348193c93
3482< static void __init ar71xx_usb_setup(void)
3483---
3484> static void ar71xx_usb_setup(void)
3485108c108
3486< static void __init ar91xx_usb_setup(void)
3487---
3488> static void ar91xx_usb_setup(void)
3489diff -r WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
349046,49d45
3491< config AR71XX_MACH_WNDR3700
3492< 	bool "NETGEAR WNDR3700 board support"
3493< 	default y
3494< 
3495diff -r WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
349611d10
3497< #include <linux/pci.h>
349818d16
3499< #include <linux/ath9k_platform.h>
3500110d107
3501< #ifdef CONFIG_PCI
3502119,141d115
3503< static struct ath9k_platform_data tl_wr741nd_wmac_data;
3504< 
3505< static int tl_wr741nd_pci_plat_dev_init(struct pci_dev *dev)
3506< {
3507< 	dev->dev.platform_data = &tl_wr741nd_wmac_data;
3508< 	return 0;
3509< }
3510< 
3511< static void tl_wr741nd_pci_init(void)
3512< {
3513< 	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
3514< 
3515< 	memcpy(tl_wr741nd_wmac_data.eeprom_data, ee,
3516< 	       sizeof(tl_wr741nd_wmac_data.eeprom_data));
3517< 
3518< 	ar71xx_pci_plat_dev_init = tl_wr741nd_pci_plat_dev_init;
3519< 
3520< 	ar71xx_pci_init(ARRAY_SIZE(tl_wr741nd_pci_irqs), tl_wr741nd_pci_irqs);
3521< }
3522< #else
3523< static inline void tl_wr741nd_pci_init(void) { };
3524< #endif /* CONFIG_PCI */
3525< 
3526174c148
3527< 	tl_wr741nd_pci_init();
3528---
3529> 	ar71xx_pci_init(ARRAY_SIZE(tl_wr741nd_pci_irqs), tl_wr741nd_pci_irqs);
3530diff -r WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
353113d12
3532< #include <linux/pci.h>
353318d16
3534< #include <linux/ath9k_platform.h>
353537,41c35,39
3536< #define UBNT_M_GPIO_LED_L1	0
3537< #define UBNT_M_GPIO_LED_L2	1
3538< #define UBNT_M_GPIO_LED_L3	11
3539< #define UBNT_M_GPIO_LED_L4	7
3540< #define UBNT_M_GPIO_BTN_RESET	12
3541---
3542> #define UBNT_BULLET_M_GPIO_LED_L1	0
3543> #define UBNT_BULLET_M_GPIO_LED_L2	1
3544> #define UBNT_BULLET_M_GPIO_LED_L3	11
3545> #define UBNT_BULLET_M_GPIO_LED_L4	7
3546> #define UBNT_BULLET_M_GPIO_BTN_RESET	12
3547110c108
3548< static struct gpio_led ubnt_m_leds_gpio[] __initdata = {
3549---
3550> static struct gpio_led ubnt_bullet_m_leds_gpio[] __initdata = {
3551113c111
3552< 		.gpio		= UBNT_M_GPIO_LED_L1,
3553---
3554> 		.gpio		= UBNT_BULLET_M_GPIO_LED_L1,
3555117c115
3556< 		.gpio		= UBNT_M_GPIO_LED_L2,
3557---
3558> 		.gpio		= UBNT_BULLET_M_GPIO_LED_L2,
3559121c119
3560< 		.gpio		= UBNT_M_GPIO_LED_L3,
3561---
3562> 		.gpio		= UBNT_BULLET_M_GPIO_LED_L3,
3563125c123
3564< 		.gpio		= UBNT_M_GPIO_LED_L4,
3565---
3566> 		.gpio		= UBNT_BULLET_M_GPIO_LED_L4,
3567141c139
3568< static struct gpio_button ubnt_m_gpio_buttons[] __initdata = {
3569---
3570> static struct gpio_button ubnt_bullet_m_gpio_buttons[] __initdata = {
3571147c145
3572< 		.gpio		= UBNT_M_GPIO_BTN_RESET,
3573---
3574> 		.gpio		= UBNT_BULLET_M_GPIO_BTN_RESET,
3575249,250c247
3576< #ifdef CONFIG_PCI
3577< static struct ar71xx_pci_irq ubnt_m_pci_irqs[] __initdata = {
3578---
3579> static struct ar71xx_pci_irq ubnt_bullet_m_pci_irqs[] __initdata = {
3580258,282c255
3581< static struct ath9k_platform_data ubnt_m_wmac_data;
3582< 
3583< static int ubmnt_m_pci_plat_dev_init(struct pci_dev *dev)
3584< {
3585< 	dev->dev.platform_data = &ubnt_m_wmac_data;
3586< 	return 0;
3587< }
3588< 
3589< static void __init ubnt_m_pci_init(void)
3590< {
3591< 	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
3592< 
3593< 	memcpy(ubnt_m_wmac_data.eeprom_data, ee,
3594< 	       sizeof(ubnt_m_wmac_data.eeprom_data));
3595< 
3596< 	ar71xx_pci_plat_dev_init = ubmnt_m_pci_plat_dev_init;
3597< 
3598< 	ar71xx_pci_init(ARRAY_SIZE(ubnt_m_pci_irqs),
3599< 			ubnt_m_pci_irqs);
3600< }
3601< #else
3602< static inline void ubnt_m_pci_init(void) { };
3603< #endif /* CONFIG_PCI */
3604< 
3605< static void __init ubnt_m_setup(void)
3606---
3607> static void __init ubnt_bullet_m_setup(void)
3608287d259
3609< 
3610301,304c273,274
3611< 	ubnt_m_pci_init();
3612< 
3613< 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_m_leds_gpio),
3614< 					ubnt_m_leds_gpio);
3615---
3616> 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_bullet_m_leds_gpio),
3617> 					ubnt_bullet_m_leds_gpio);
3618307,312c277,278
3619< 					ARRAY_SIZE(ubnt_m_gpio_buttons),
3620< 					ubnt_m_gpio_buttons);
3621< }
3622< 
3623< MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "Ubiquiti Bullet M", ubnt_m_setup);
3624< MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "Ubiquiti Rocket M", ubnt_m_setup);
3625---
3626> 					ARRAY_SIZE(ubnt_bullet_m_gpio_buttons),
3627> 					ubnt_bullet_m_gpio_buttons);
3628314,326c280,281
3629< /* TODO detect the second ethernet port and use one
3630<    init function for all Ubiquiti MIMO series products */
3631< static void __init ubnt_nano_m_setup(void)
3632< {
3633< 	ubnt_m_setup();
3634< 
3635< 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
3636< 	ar71xx_eth1_data.phy_mask = 0;
3637< 
3638< 	ar71xx_eth1_data.speed = SPEED_1000;
3639< 	ar71xx_eth1_data.duplex = DUPLEX_FULL;
3640< 
3641< 	ar71xx_add_device_eth(1);
3642---
3643> 	ar71xx_pci_init(ARRAY_SIZE(ubnt_bullet_m_pci_irqs),
3644> 			ubnt_bullet_m_pci_irqs);
3645329c284
3646< MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "Ubiquiti Nanostation M", ubnt_nano_m_setup);
3647---
3648> MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "Ubiquiti Bullet M", ubnt_bullet_m_setup);
3649Seulement dans WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/ar71xx: mach-wndr3700.c
3650diff -r WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
365129d28
3652< obj-$(CONFIG_AR71XX_MACH_WNDR3700)	+= mach-wndr3700.o
3653diff -r WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
365489,97d88
3655< 		.name		= "UBNT-RM",
3656< 		.mach_type	= AR71XX_MACH_UBNT_ROCKET_M,
3657< 	}, {
3658< 		.name		= "UBNT-NM",
3659< 		.mach_type	= AR71XX_MACH_UBNT_NANO_M,
3660< 	}, {
3661< 		.name		= "WNDR3700",
3662< 		.mach_type	= AR71XX_MACH_WNDR3700,
3663< 	}, {
3664diff -r WNDR4300v2-basecompare/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/ar71xx.h
3665144,145d143
3666< 	AR71XX_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
3667< 	AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
3668147d144
3669< 	AR71XX_MACH_WNDR3700,	/* NETGEAR WNDR3700 */
3670256,274c253
3671< #define AR724X_GPIO_FUNC_GE0_MII_CLK_EN		BIT(19)
3672< #define AR724X_GPIO_FUNC_SPI_EN			BIT(18)
3673< #define AR724X_GPIO_FUNC_SPI_CS_EN2		BIT(14)
3674< #define AR724X_GPIO_FUNC_SPI_CS_EN1		BIT(13)
3675< #define AR724X_GPIO_FUNC_CLK_OBS5_EN		BIT(12)
3676< #define AR724X_GPIO_FUNC_CLK_OBS4_EN		BIT(11)
3677< #define AR724X_GPIO_FUNC_CLK_OBS3_EN		BIT(10)
3678< #define AR724X_GPIO_FUNC_CLK_OBS2_EN		BIT(9)
3679< #define AR724X_GPIO_FUNC_CLK_OBS1_EN		BIT(8)
3680< #define AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN	BIT(7)
3681< #define AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN	BIT(6)
3682< #define AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN	BIT(5)
3683< #define AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN	BIT(4)
3684< #define AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN	BIT(3)
3685< #define AR724X_GPIO_FUNC_UART_RTS_CTS_EN	BIT(2)
3686< #define AR724X_GPIO_FUNC_UART_EN		BIT(1)
3687< #define AR724X_GPIO_FUNC_JTAG_DISABLE		BIT(0)
3688< 
3689< #define AR724X_GPIO_COUNT	18
3690---
3691> #define AR724X_GPIO_COUNT	16
3692323,324d301
3693< #define AR724X_DDR_REG_FLUSH_USB	0x84
3694< #define AR724X_DDR_REG_FLUSH_PCIE	0x88
3695diff -r WNDR4300v2-basecompare/target/linux/ar71xx/image/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/image/Makefile
3696141,156d140
3697< ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1024k(kernel),6528k(rootfs),256k(cfg)ro,64k(EEPROM)ro,7552k@0x50000(firmware)
3698< define Image/Build/UBNTXM
3699< 	$(call PatchKernelLzma,$(2),$(3) $(ubntxm_mtdlayout))
3700< 	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage.bin)
3701< 	dd if=$(KDIR)/vmlinux-$(2).uImage.bin of=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync
3702< 	-$(STAGING_DIR_HOST)/bin/mkfwimage \
3703< 		-B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
3704< 		-k $(KDIR)/vmlinux-$(2).uImage \
3705< 		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
3706< 		-o $(call imgname,$(1),$(2))-factory.bin
3707< 	( \
3708< 		dd if=$(KDIR)/vmlinux-$(2).uImage; \
3709< 		dd if=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1); \
3710< 	) > $(call imgname,$(1),$(2))-sysupgrade.bin
3711< endef
3712< 
3713164,168c148
3714< 		-o $(call imgname,$(1),$(2))-factory.bin
3715< 	-sh $(TOPDIR)/scripts/combined-image.sh \
3716< 		"$(KDIR)/vmlinux-$(2).lzma" \
3717< 		"$(BIN_DIR)/openwrt-$(BOARD)-root.$(1)" \
3718< 		$(call imgname,$(1),$(2))-sysupgrade.bin
3719---
3720> 		-o $(call imgname,$(1),$(2)).bin
3721200c180
3722< 		-o $(call imgname,$(1),$(2))-universal.bin
3723---
3724> 		-o $(call imgname,$(1),$(2)).uni
3725218,249d197
3726< wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
3727< define Image/Build/WNDR3700
3728< 	$(call PatchKernelLzma,$(2),$(3) $(wndr3700_mtdlayout))
3729< 	$(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage)
3730< 	mkdir $(KDIR)/wndr3700
3731< 	mkdir $(KDIR)/wndr3700/image
3732< 	$(STAGING_DIR_HOST)/bin/wndr3700 \
3733< 		$(KDIR)/vmlinux-$(2).uImage \
3734< 		$(KDIR)/wndr3700/image/uImage
3735< 	$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
3736< 		$(KDIR)/wndr3700 $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp \
3737< 		-nopad -noappend -root-owned -be
3738< 	-rm -rf $(KDIR)/wndr3700
3739< 	mkimage -A mips -O linux -T filesystem -C none \
3740< 		-a 0xbf070000 -e 0xbf070000 \
3741< 		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
3742< 		-d $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp \
3743< 		$(KDIR)/vmlinux-$(2).uImage.squashfs.tmp2
3744< 	$(STAGING_DIR_HOST)/bin/wndr3700 \
3745< 		$(KDIR)/vmlinux-$(2).uImage.squashfs.tmp2 \
3746< 		$(KDIR)/vmlinux-$(2).uImage.squashfs
3747< 	-rm -f $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp*
3748< 	( \
3749< 		dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1M conv=sync; \
3750< 		dd if=$(KDIR)/root.$(1) bs=64k; \
3751< 	) > $(call imgname,$(1),$(2))-sysupgrade.bin
3752< 	$(STAGING_DIR_HOST)/bin/mkdniimg \
3753< 		-B WNDR3700 -v OpenWrt.$(REVISION) \
3754< 		-i $(call imgname,$(1),$(2))-sysupgrade.bin \
3755< 		-o $(call imgname,$(1),$(2))-factory.bin
3756< endef
3757< 
3758315c263
3759< 	$(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3))
3760---
3761> 	$(call Image/Build/Template/TPLINK,squashfs-4k,$(1),$(2),$(3))
3762330,341d277
3763< define Image/Build/Template/UBNTXM
3764< 	$(call Image/Build/UBNTXM,$(1),$(2),$(3),$(4),$(5),$(6))
3765< endef
3766< 
3767< define Image/Build/Template/UBNTXM/squashfs
3768< 	$(call Image/Build/Template/UBNTXM,squashfs,$(1),$(2),$(3),$(4),$(5))
3769< endef
3770< 
3771< define Image/Build/Template/UBNTXM/jffs2-64k
3772< 	$(call Image/Build/Template/UBNTXM,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
3773< endef
3774< 
3775354,365d289
3776< define Image/Build/Template/WNDR3700
3777< 	$(call Image/Build/WNDR3700,$(1),$(2),$(3))
3778< endef
3779< 
3780< define Image/Build/Template/WNDR3700/squashfs
3781< 	$(call Image/Build/Template/WNDR3700,squashfs,$(1),$(2))
3782< endef
3783< 
3784< define Image/Build/Template/WNDR3700/jffs2-64k
3785< 	$(call Image/Build/Template/WNDR3700,jffs2-64k,$(1),$(2))
3786< endef
3787< 
3788402,413d325
3789< define Image/Build/Profile/UBNTBULLETM
3790< 	$(call Image/Build/Template/UBNTXM/$(1),ubnt-bullet-m,board=UBNT-BM,XM,UBNTXM,ar7240)
3791< endef
3792< 
3793< define Image/Build/Profile/UBNTROCKETM
3794< 	$(call Image/Build/Template/UBNTXM/$(1),ubnt-rocket-m,board=UBNT-RM,XM,UBNTXM,ar7240)
3795< endef
3796< 
3797< define Image/Build/Profile/UBNTNANOM
3798< 	$(call Image/Build/Template/UBNTXM/$(1),ubnt-nano-m,board=UBNT-NM,XM,UBNTXM,ar7240)
3799< endef
3800< 
3801418,420d329
3802< 	$(call Image/Build/Profile/UBNTBULLETM,$(1))
3803< 	$(call Image/Build/Profile/UBNTROCKETM,$(1))
3804< 	$(call Image/Build/Profile/UBNTNANOM,$(1))
3805447,450d355
3806< define Image/Build/Profile/WNDR3700
3807< 	$(call Image/Build/Template/WNDR3700/$(1),wndr3700,board=WNDR3700)
3808< endef
3809< 
3810473d377
3811< 	$(call Image/Build/Profile/WNDR3700,$(1))
3812479,481c383
3813< 	$(call Image/Build/Profile/UBNTRS,$(1))
3814< 	$(call Image/Build/Profile/UBNTRSPRO,$(1))
3815< 	$(call Image/Build/Profile/UBNTLSSR71,$(1))
3816---
3817> 	$(call Image/Build/Profile/UBNT,$(1))
3818486,489c388
3819< 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
3820< 	dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.squashfs-4k.tmp0 bs=4k conv=sync
3821< 	$(call add_jffs2_mark,$(KDIR)/root.squashfs-4k.tmp0)
3822< 	dd if=$(KDIR)/root.squashfs-4k.tmp0 of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
3823---
3824> 	dd if=$(KDIR)/root.squashfs of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
3825491c390
3826< 	rm -f $(KDIR)/root.squashfs-4k.tmp0
3827---
3828> 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
3829Seulement dans WNDR4300v2-basecompare/target/linux/ar71xx/profiles: netgear.mk
3830diff -r WNDR4300v2-basecompare/target/linux/ar71xx/profiles/tp-link.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ar71xx/profiles/tp-link.mk
383129,39d28
3832< define Profile/TLWR841NDV5
3833< 	NAME:=TP-LINK TL-WR841ND v5
3834< 	PACKAGES:=kmod-ath9k hostapd-mini
3835< endef
3836< 
3837< define Profile/TLWR841NDV5/Description
3838< 	Package set optimized for the TP-LINK TL-WR841ND v5.
3839< endef
3840< 
3841< $(eval $(call Profile,TLWR841NDV5))
3842< 
3843Seulement dans WNDR4300v2-basecompare/target/linux/at91/base-files: sbin
3844diff -r WNDR4300v2-basecompare/target/linux/at91/config-2.6.25 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/at91/config-2.6.25
38452a3
3846> CONFIG_ARCH_AT91=y
38474d4
3848< # CONFIG_ARCH_AT91RM9200DK is not set
38495a6
3850> # CONFIG_ARCH_AT91RM9200DK is not set
385111d11
3852< CONFIG_ARCH_AT91=y
385317a18
3854> CONFIG_ARM=y
385520d20
3856< CONFIG_ARM=y
385732d31
3858< # CONFIG_AT91_SPIDEV is not set
385933a33
3860> # CONFIG_AT91_SPIDEV is not set
386137a38
3862> CONFIG_BASE_SMALL=0
386339a41
3864> CONFIG_BLK_DEV_RAM=y
386542d43
3866< CONFIG_BLK_DEV_RAM=y
386748d48
3868< CONFIG_CPU_32v4T=y
386949a50
3870> CONFIG_CPU_32v4T=y
387155d55
3872< CONFIG_CPU_CP15_MMU=y
387356a57
3874> CONFIG_CPU_CP15_MMU=y
387562a64
3876> # CONFIG_DEBUG_BUGVERBOSE is not set
387768d69
3878< # CONFIG_FPE_NWFPE_XP is not set
387969a71
3880> # CONFIG_FPE_NWFPE_XP is not set
388172d73
3882< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
388373a75
3884> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
388585a88
3886> # CONFIG_I2C is not set
388792d94
3888< CONFIG_LEDS_CPU=y
388994c96
3890< CONFIG_LEGACY_PTY_COUNT=32
3891---
3892> CONFIG_LEDS_CPU=y
389395a98
3894> CONFIG_LEGACY_PTY_COUNT=32
3895131a135
3896> # CONFIG_NVRAM is not set
3897133d136
3898< # CONFIG_PCI is not set
3899136d138
3900< # CONFIG_PPP_MULTILINK is not set
3901138a141
3902> # CONFIG_PPP_MULTILINK is not set
3903142a146
3904> CONFIG_SERIAL_ATMEL=y
3905146c150
3906< CONFIG_SERIAL_ATMEL=y
3907---
3908> CONFIG_SERIO=y
3909150d153
3910< CONFIG_SERIO=y
3911156a160
3912> CONFIG_TICK_ONESHOT=y
3913158d161
3914< # CONFIG_USB_ARCH_HAS_EHCI is not set
3915159a163
3916> # CONFIG_USB_ARCH_HAS_EHCI is not set
3917206d209
3918< # CONFIG_VGA_CONSOLE is not set
3919207a211
3920> # CONFIG_VGA_CONSOLE is not set
3921208a213
3922> CONFIG_VT=y
3923211d215
3924< CONFIG_VT=y
3925Seulement dans WNDR4300v2-basecompare/target/linux/at91/image/dfboot/src: binary
3926Seulement dans WNDR4300v2-basecompare/target/linux/at91: profiles
3927diff -r WNDR4300v2-basecompare/target/linux/atheros/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/atheros/config-2.6.30
392812d11
3929< CONFIG_ATHEROS_AR2315_PCI=y
393013a13
3931> CONFIG_ATHEROS_AR2315_PCI=y
393216a17
3933> CONFIG_BASE_SMALL=0
393422d22
3935< CONFIG_CEVT_R4K_LIB=y
393623a24
3937> CONFIG_CEVT_R4K_LIB=y
393832a34
3939> CONFIG_CPU_MIPS32=y
394035d36
3941< CONFIG_CPU_MIPS32=y
394257d57
3943< CONFIG_CSRC_R4K_LIB=y
394458a59
3945> CONFIG_CSRC_R4K_LIB=y
394664d64
3947< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
394865a66
3949> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
395082a84
3951> # CONFIG_I2C is not set
395295a98
3953> CONFIG_MIPS=y
3954105d107
3955< CONFIG_MIPS=y
3956119a122
3957> CONFIG_PCI=y
3958120a124
3959> # CONFIG_PCSPKR_PLATFORM is not set
3960149a154
3961> CONFIG_TICK_ONESHOT=y
3962diff -r WNDR4300v2-basecompare/target/linux/atheros/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/atheros/config-2.6.31
396315d14
3964< CONFIG_ATHEROS_AR2315_PCI=y
396516a16
3966> CONFIG_ATHEROS_AR2315_PCI=y
396719a20
3968> CONFIG_BASE_SMALL=0
396925d25
3970< CONFIG_CEVT_R4K_LIB=y
397126a27
3972> CONFIG_CEVT_R4K_LIB=y
397335a37
3974> CONFIG_CPU_MIPS32=y
397538d39
3976< CONFIG_CPU_MIPS32=y
397760d60
3978< CONFIG_CSRC_R4K_LIB=y
397961a62
3980> CONFIG_CSRC_R4K_LIB=y
398168d68
3982< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
398369a70
3984> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
398583d83
3986< CONFIG_HAVE_MLOCKED_PAGE_BIT=y
398784a85
3988> CONFIG_HAVE_MLOCKED_PAGE_BIT=y
398987a89
3990> # CONFIG_I2C is not set
3991101a104
3992> CONFIG_MIPS=y
3993111d113
3994< CONFIG_MIPS=y
3995125a128
3996> CONFIG_PCI=y
3997126a130
3998> # CONFIG_PCSPKR_PLATFORM is not set
3999155a160
4000> CONFIG_TICK_ONESHOT=y
4001diff -r WNDR4300v2-basecompare/target/linux/atheros/image/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/atheros/image/Makefile
400258c58
4003< 		"$(BIN_DIR)/openwrt-$(BOARD)-combined.$(1).img"
4004---
4005> 		"$(BIN_DIR)/openwrt-$(BOARD)-combined.img"
4006diff -r WNDR4300v2-basecompare/target/linux/atheros/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/atheros/Makefile
400712a13
4008> CUSTOMER:=openwrt
4009Seulement dans WNDR4300v2-basecompare/target/linux/atheros: profiles
4010diff -r WNDR4300v2-basecompare/target/linux/au1000/au1500/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/au1000/au1500/config-default
401110a11
4012> CONFIG_BASE_SMALL=0
401324a26
4014> CONFIG_CPU_MIPS32=y
401527d28
4016< CONFIG_CPU_MIPS32=y
401766d66
4018< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
401967a68
4020> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
402186d86
4022< # CONFIG_HZ_100 is not set
402387a88
4024> # CONFIG_HZ_100 is not set
402588a90
4026> CONFIG_I2C=m
402794d95
4028< CONFIG_I2C=m
4029107a109
4030> CONFIG_MIPS=y
4031120a123
4032> CONFIG_MIPS_MTX1=y
4033124d126
4034< CONFIG_MIPS_MTX1=y
4035132d133
4036< CONFIG_MIPS=y
4037138a140
4038> # CONFIG_NATSEMI is not set
4039142a145
4040> CONFIG_PCI=y
4041181a185
4042> CONFIG_TICK_ONESHOT=y
4043diff -r WNDR4300v2-basecompare/target/linux/au1000/au1550/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/au1000/au1550/config-default
404411a12
4045> CONFIG_BASE_SMALL=0
404623a25
4047> CONFIG_CPU_MIPS32=y
404826d27
4049< CONFIG_CPU_MIPS32=y
405063d63
4051< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
405264a65
4053> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
405484d84
4055< CONFIG_HOSTAP_CS=m
405685a86
4057> CONFIG_HOSTAP_CS=m
405889d89
4059< # CONFIG_HZ_100 is not set
406090a91
4061> # CONFIG_HZ_100 is not set
406291a93
4063> # CONFIG_I2C is not set
406492a95
4065> CONFIG_IEEE80211=m
406696d98
4067< CONFIG_IEEE80211=m
4068126a129
4069> CONFIG_MIPS=y
4070138a142
4071> # CONFIG_MIPS_MTX1 is not set
4072142d145
4073< # CONFIG_MIPS_MTX1 is not set
4074150d152
4075< CONFIG_MIPS=y
4076155a158
4077> CONFIG_MTD_PHYSMAP=y
4078159,171c162
4079< CONFIG_MTD_PHYSMAP=y
4080< CONFIG_NET_ACT_GACT=m
4081< CONFIG_NET_ACT_IPT=m
4082< CONFIG_NET_ACT_MIRRED=m
4083< CONFIG_NET_ACT_PEDIT=m
4084< CONFIG_NET_CLS_BASIC=m
4085< CONFIG_NET_CLS_FLOW=m
4086< CONFIG_NET_CLS_FW=m
4087< CONFIG_NET_CLS_ROUTE4=m
4088< CONFIG_NET_CLS_RSVP6=m
4089< CONFIG_NET_CLS_RSVP=m
4090< CONFIG_NET_CLS_TCINDEX=m
4091< CONFIG_NET_CLS_U32=m
4092---
4093> # CONFIG_NATSEMI is not set
4094191a183,194
4095> CONFIG_NET_ACT_GACT=m
4096> CONFIG_NET_ACT_IPT=m
4097> CONFIG_NET_ACT_MIRRED=m
4098> CONFIG_NET_ACT_PEDIT=m
4099> CONFIG_NET_CLS_BASIC=m
4100> CONFIG_NET_CLS_FLOW=m
4101> CONFIG_NET_CLS_FW=m
4102> CONFIG_NET_CLS_ROUTE4=m
4103> CONFIG_NET_CLS_RSVP=m
4104> CONFIG_NET_CLS_RSVP6=m
4105> CONFIG_NET_CLS_TCINDEX=m
4106> CONFIG_NET_CLS_U32=m
4107192a196
4108> CONFIG_NF_CONNTRACK=m
4109196d199
4110< CONFIG_NF_CONNTRACK=m
4111197a201
4112> CONFIG_NF_NAT=m
4113200d203
4114< CONFIG_NF_NAT=m
4115209a213
4116> CONFIG_PCI=y
4117210a215
4118> CONFIG_PCMCIA=m
4119214d218
4120< CONFIG_PCMCIA=m
4121221,223d224
4122< CONFIG_PPP_ASYNC=m
4123< CONFIG_PPP_BSDCOMP=m
4124< CONFIG_PPP_DEFLATE=m
4125226a228,230
4126> CONFIG_PPP_ASYNC=m
4127> CONFIG_PPP_BSDCOMP=m
4128> CONFIG_PPP_DEFLATE=m
4129270a275
4130> CONFIG_TICK_ONESHOT=y
4131diff -r WNDR4300v2-basecompare/target/linux/au1000/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/au1000/Makefile
413211a12
4133> CUSTOMER:=openwrt
4134diff -r WNDR4300v2-basecompare/target/linux/avr32/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/avr32/config-default
413519a20
4136> CONFIG_BASE_SMALL=0
413730a32,33
4138> # CONFIG_CPU_FREQ is not set
4139> # CONFIG_DEBUG_BUGVERBOSE is not set
414058c61
4141< # CONFIG_MMC_ATMELMCI_DMA is not set
4142---
4143> CONFIG_MMC=m
414459a63
4145> # CONFIG_MMC_ATMELMCI_DMA is not set
414661d64
4147< CONFIG_MMC=m
414880d82
4149< # CONFIG_PCI is not set
4150102a105
4151> CONFIG_TICK_ONESHOT=y
4152diff -r WNDR4300v2-basecompare/target/linux/avr32/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/avr32/Makefile
415311a12
4154> CUSTOMER:=openwrt
4155diff -r WNDR4300v2-basecompare/target/linux/brcm-2.4/base-files/etc/init.d/netconfig WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
41567,41c7
4157< 	[ -e /etc/config/network ] && {
4158< 		local batch
4159< 
4160< 		config_cb() {
4161< 			case "$1" in
4162< 			switch)
4163< 				option_cb() {
4164< 					case "$1" in
4165< 					vlan[0-9]|vlan1[0-5])
4166< 						local id="${1#vlan}"
4167< 						append batch "delete network.eth0.${1}${N}"
4168< 						append batch "set network.eth0_${n}=switch_vlan${N}"
4169< 						append batch "set network.eth0_${n}.device=eth0${N}"
4170< 						append batch "set network.eth0_${n}.vlan=${id}${N}"
4171< 						append batch "set network.eth0_${n}.ports='${2}'${N}"
4172< 					;;
4173< 					esac
4174< 				}
4175< 			;;
4176< 			switch_vlan)
4177< 				option_cb() { :; }
4178< 				batch=""
4179< 			;;
4180< 			esac
4181< 		}
4182< 
4183< 		config_load network
4184< 
4185< 		[ -n "$batch" ] && {
4186< 			logger -t netconfig "migrating switch config to new format ..."
4187< 			echo "$batch${N}commit network" | uci batch
4188< 		}
4189< 
4190< 		exit 0
4191< 	}
4192---
4193> 	[ -e /etc/config/network ] && exit 0
419457,66d22
4195< 	function vlan(id, name) {
4196< 		if (c[name] != "") {
4197< 			print "config switch_vlan eth0_" id
4198< 			print "	option device   \"eth0\""
4199< 			print "	option vlan     " id
4200< 			print "	option ports    \"" c[name] "\""
4201< 			print ""
4202< 		}
4203< 	}
4204< 
4205212,215c168,171
4206< 			print "	option enable   1"
4207< 			print ""		
4208< 			vlan(0, "vlan0ports")
4209< 			vlan(1, "vlan1ports")
4210---
4211> 			p("vlan0", "vlan0ports")
4212> 			p("vlan1", "vlan1ports")
4213> 			print ""
4214> 			print ""
4215diff -r WNDR4300v2-basecompare/target/linux/brcm-2.4/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm-2.4/config-default
42164,5d3
4217< # CONFIG_8139_OLD_RX_RESET is not set
4218< # CONFIG_8139TOO_8129 is not set
42196a5
4220> # CONFIG_8139TOO_8129 is not set
42218a8
4222> # CONFIG_8139_OLD_RX_RESET is not set
422312d11
4224< # CONFIG_AIRO_CS is not set
422513a13
4226> # CONFIG_AIRO_CS is not set
422720d19
4228< # CONFIG_AX25_DAMA_SLAVE is not set
422921a21
4230> # CONFIG_AX25_DAMA_SLAVE is not set
423137d36
4232< # CONFIG_BLK_DEV_ATARAID_HPT is not set
423338a38
4234> # CONFIG_BLK_DEV_ATARAID_HPT is not set
423543d42
4236< # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
423744a44
4238> # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
423952a53
4240> CONFIG_BLK_DEV_IDE=m
424155a57
4242> CONFIG_BLK_DEV_IDEDMA=y
424358d59
4244< CONFIG_BLK_DEV_IDEDMA=y
424560d60
4246< CONFIG_BLK_DEV_IDE=m
424762d61
4248< # CONFIG_BLK_DEV_IDE_SATA is not set
424964a64
4250> # CONFIG_BLK_DEV_IDE_SATA is not set
425168a69
4252> CONFIG_BLK_DEV_PDC202XX=y
425371d71
4254< CONFIG_BLK_DEV_PDC202XX=y
425581a82
4256> CONFIG_BLUEZ=m
425790c91
4258< CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
4259---
4260> CONFIG_BLUEZ_HCIUART=m
426191a93
4262> CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
426393d94
4264< CONFIG_BLUEZ_HCIUART=m
426598d98
4266< CONFIG_BLUEZ=m
4267104d103
4268< # CONFIG_CMDLINE_BOOL is not set
4269105a105
4270> # CONFIG_CMDLINE_BOOL is not set
4271126d125
4272< # CONFIG_I2O_BLOCK is not set
4273127a127
4274> # CONFIG_I2O_BLOCK is not set
4275136c136
4276< # CONFIG_IDE_CHIPSETS is not set
4277---
4278> CONFIG_IDE=m
4279144d143
4280< CONFIG_IDE=m
4281145a145
4282> # CONFIG_IDE_CHIPSETS is not set
4283162d161
4284< CONFIG_MTD_CFI_B1=y
4285163a163
4286> CONFIG_MTD_CFI_B1=y
4287167a168
4288> # CONFIG_NETROM is not set
4289170d170
4290< # CONFIG_NETROM is not set
4291174a175
4292> CONFIG_PARPORT=m
4293180d180
4294< CONFIG_PARPORT=m
4295185a186
4296> CONFIG_PCI=y
4297190c191
4298< CONFIG_PCI=y
4299---
4300> CONFIG_PCMCIA=m
4301193d193
4302< CONFIG_PCMCIA=m
4303221d220
4304< # CONFIG_SCSI_SYM53C8XX_2 is not set
4305222a222
4306> # CONFIG_SCSI_SYM53C8XX_2 is not set
4307225a226,227
4308> CONFIG_SOUND=m
4309> # CONFIG_SOUNDMODEM is not set
4310238,239d239
4311< CONFIG_SOUND=m
4312< # CONFIG_SOUND_MAESTRO3 is not set
4313241c241
4314< # CONFIG_SOUNDMODEM is not set
4315---
4316> # CONFIG_SOUND_MAESTRO3 is not set
4317259a260
4318> CONFIG_USB=m
4319274a276
4320> # CONFIG_USB_HID is not set
4321277d278
4322< # CONFIG_USB_HID is not set
4323285d285
4324< CONFIG_USB=m
4325299a300
4326> CONFIG_USB_SERIAL=m
4327314a316
4328> CONFIG_USB_SERIAL_KEYSPAN_USA19=y
4329318c320,321
4330< CONFIG_USB_SERIAL_KEYSPAN_USA19=y
4331---
4332> CONFIG_USB_SERIAL_KEYSPAN_USA28=y
4333> CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
4334321,323d323
4335< CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
4336< CONFIG_USB_SERIAL_KEYSPAN_USA28=y
4337< CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
4338324a325
4339> CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
4340327d327
4341< CONFIG_USB_SERIAL=m
4342334a335
4343> CONFIG_USB_STORAGE=m
4344342d342
4345< CONFIG_USB_STORAGE=m
4346347d346
4347< CONFIG_USB_UHCI_ALT=m
4348348a348
4349> CONFIG_USB_UHCI_ALT=m
4350364a365
4351> # CONFIG_VIDEO_ZORAN is not set
4352367d367
4353< # CONFIG_VIDEO_ZORAN is not set
4354diff -r WNDR4300v2-basecompare/target/linux/brcm-2.4/files/arch/mips/bcm947xx/prom.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm-2.4/files/arch/mips/bcm947xx/prom.c
435534,42d33
4356< 
4357< 	/* Ignoring the last page when ddr size is 128M. Cached
4358< 	 * accesses to last page is causing the processor to prefetch
4359< 	 * using address above 128M stepping out of the ddr address
4360< 	 * space.
4361< 	 */
4362< 	if (mem == 0x8000000)
4363< 		mem -= 0x1000;
4364< 
4365diff -r WNDR4300v2-basecompare/target/linux/brcm-2.4/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm-2.4/Makefile
436611a12
4367> CUSTOMER:=openwrt
4368Le fichier WNDR4300v2-basecompare/target/linux/brcm47xx/base-files est un fichier régulier alors que le fichier WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm47xx/base-files est un répertoire
4369diff -r WNDR4300v2-basecompare/target/linux/brcm47xx/base-files.mk WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm47xx/base-files.mk
43701c1,5
4371< link ../brcm-2.4/base-files.mk
4372\ Pas de fin de ligne à la fin du fichier
4373---
4374> define Package/base-files/install-target
4375> 	rm -f $(1)/etc/config/network
4376> endef
4377> 
4378> 
4379diff -r WNDR4300v2-basecompare/target/linux/brcm47xx/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm47xx/config-2.6.28
438011,13d10
4381< CONFIG_B44_PCI_AUTOSELECT=y
4382< CONFIG_B44_PCICORE_AUTOSELECT=y
4383< CONFIG_B44_PCI=y
438415c12,15
4385< CONFIG_BCM47XX_WDT=y
4386---
4387> CONFIG_B44_PCI=y
4388> CONFIG_B44_PCICORE_AUTOSELECT=y
4389> CONFIG_B44_PCI_AUTOSELECT=y
4390> CONFIG_BASE_SMALL=0
439116a17
4392> CONFIG_BCM47XX_WDT=y
439329a31
4394> CONFIG_CPU_MIPS32=y
439532d33
4396< CONFIG_CPU_MIPS32=y
439759d59
4398< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
439960a61
4400> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
440176d76
4402< # CONFIG_HZ_100 is not set
440377a78
4404> # CONFIG_HZ_100 is not set
440578a80
4406> # CONFIG_I2C is not set
440794a97
4408> CONFIG_MIPS=y
440996d98
4410< # CONFIG_MIPS_FPU_EMU is not set
4411104d105
4412< CONFIG_MIPS=y
4413105a107
4414> # CONFIG_NATSEMI is not set
4415109a112
4416> CONFIG_PCI=y
4417110a114
4418> # CONFIG_PCSPKR_PLATFORM is not set
4419137a142
4420> CONFIG_SSB=y
4421143d147
4422< CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4423144a149
4424> CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4425147d151
4426< CONFIG_SSB_PCIHOST_POSSIBLE=y
4427148a153
4428> CONFIG_SSB_PCIHOST_POSSIBLE=y
4429151d155
4430< CONFIG_SSB=y
4431156a161
4432> CONFIG_TICK_ONESHOT=y
4433diff -r WNDR4300v2-basecompare/target/linux/brcm47xx/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm47xx/config-2.6.30
443410,12d9
4435< CONFIG_B44_PCI_AUTOSELECT=y
4436< CONFIG_B44_PCICORE_AUTOSELECT=y
4437< CONFIG_B44_PCI=y
443814c11,14
4439< CONFIG_BCM47XX_WDT=y
4440---
4441> CONFIG_B44_PCI=y
4442> CONFIG_B44_PCICORE_AUTOSELECT=y
4443> CONFIG_B44_PCI_AUTOSELECT=y
4444> CONFIG_BASE_SMALL=0
444515a16
4446> CONFIG_BCM47XX_WDT=y
444721d21
4448< CONFIG_CEVT_R4K_LIB=y
444922a23
4450> CONFIG_CEVT_R4K_LIB=y
445131a33
4452> CONFIG_CPU_MIPS32=y
445334d35
4454< CONFIG_CPU_MIPS32=y
445562d62
4456< CONFIG_CSRC_R4K_LIB=y
445763a64
4458> CONFIG_CSRC_R4K_LIB=y
445969d69
4460< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
446170a71
4462> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
446388d88
4464< # CONFIG_HZ_100 is not set
446589a90
4466> # CONFIG_HZ_100 is not set
446790a92
4468> # CONFIG_I2C is not set
4469104a107
4470> CONFIG_MIPS=y
4471106d108
4472< # CONFIG_MIPS_FPU_EMU is not set
4473114d115
4474< CONFIG_MIPS=y
4475115a117
4476> # CONFIG_NATSEMI is not set
4477119a122
4478> CONFIG_PCI=y
4479120a124
4480> # CONFIG_PCSPKR_PLATFORM is not set
4481147a152
4482> CONFIG_SSB=y
4483153d157
4484< CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4485154a159
4486> CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4487157d161
4488< CONFIG_SSB_PCIHOST_POSSIBLE=y
4489158a163
4490> CONFIG_SSB_PCIHOST_POSSIBLE=y
4491161d165
4492< CONFIG_SSB=y
4493166a171
4494> CONFIG_TICK_ONESHOT=y
4495diff -r WNDR4300v2-basecompare/target/linux/brcm47xx/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm47xx/config-2.6.31
449613,15d12
4497< CONFIG_B44_PCI_AUTOSELECT=y
4498< CONFIG_B44_PCICORE_AUTOSELECT=y
4499< CONFIG_B44_PCI=y
450017c14,17
4501< CONFIG_BCM47XX_WDT=y
4502---
4503> CONFIG_B44_PCI=y
4504> CONFIG_B44_PCICORE_AUTOSELECT=y
4505> CONFIG_B44_PCI_AUTOSELECT=y
4506> CONFIG_BASE_SMALL=0
450718a19
4508> CONFIG_BCM47XX_WDT=y
450924d24
4510< CONFIG_CEVT_R4K_LIB=y
451125a26
4512> CONFIG_CEVT_R4K_LIB=y
451335a37
4514> CONFIG_CPU_MIPS32=y
451538d39
4516< CONFIG_CPU_MIPS32=y
451760d60
4518< CONFIG_CSRC_R4K_LIB=y
451961a62
4520> CONFIG_CSRC_R4K_LIB=y
452168d68
4522< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
452369a70
4524> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
452583d83
4526< CONFIG_HAVE_MLOCKED_PAGE_BIT=y
452784a85
4528> CONFIG_HAVE_MLOCKED_PAGE_BIT=y
452988d88
4530< # CONFIG_HZ_100 is not set
453189a90
4532> # CONFIG_HZ_100 is not set
453390a92
4534> # CONFIG_I2C is not set
4535105a108
4536> CONFIG_MIPS=y
4537115d117
4538< CONFIG_MIPS=y
4539116a119
4540> # CONFIG_NATSEMI is not set
4541120a124
4542> CONFIG_PCI=y
4543121a126
4544> # CONFIG_PCSPKR_PLATFORM is not set
4545148a154
4546> CONFIG_SSB=y
4547154d159
4548< CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4549155a161
4550> CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4551158d163
4552< CONFIG_SSB_PCIHOST_POSSIBLE=y
4553159a165
4554> CONFIG_SSB_PCIHOST_POSSIBLE=y
4555162d167
4556< CONFIG_SSB=y
4557167a173
4558> CONFIG_TICK_ONESHOT=y
4559Le fichier WNDR4300v2-basecompare/target/linux/brcm47xx/image est un fichier régulier alors que le fichier WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm47xx/image est un répertoire
4560diff -r WNDR4300v2-basecompare/target/linux/brcm47xx/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm47xx/Makefile
456111a12
4562> CUSTOMER:=openwrt
4563Seulement dans WNDR4300v2-basecompare/target/linux/brcm47xx/patches-2.6.28: 170-128MB_ram_bugfix.patch
4564Seulement dans WNDR4300v2-basecompare/target/linux/brcm47xx/patches-2.6.30: 170-128MB_ram_bugfix.patch
4565Seulement dans WNDR4300v2-basecompare/target/linux/brcm47xx/patches-2.6.31: 170-128MB_ram_bugfix.patch
4566diff -r WNDR4300v2-basecompare/target/linux/brcm63xx/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm63xx/config-2.6.30
456710d9
4568< CONFIG_AUDIT_GENERIC=y
456911a11,12
4570> CONFIG_AUDIT_GENERIC=y
4571> CONFIG_BASE_SMALL=0
457212a14
4573> CONFIG_BCM63XX=y
457420d21
4575< CONFIG_BCM63XX=y
457630d30
4577< CONFIG_CEVT_R4K_LIB=y
457831a32
4579> CONFIG_CEVT_R4K_LIB=y
458039a41
4581> CONFIG_CPU_MIPS32=y
458242d43
4583< CONFIG_CPU_MIPS32=y
458471d71
4585< CONFIG_CSRC_R4K_LIB=y
458672a73
4587> CONFIG_CSRC_R4K_LIB=y
458882d82
4589< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
459083a84
4591> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
459289d89
4593< CONFIG_GPIO_DEVICE=y
459490a91
4595> CONFIG_GPIO_DEVICE=y
4596104d104
4597< # CONFIG_HZ_100 is not set
4598105a106
4599> # CONFIG_HZ_100 is not set
4600106a108
4601> # CONFIG_I2C is not set
4602108d109
4603< CONFIG_INOTIFY_USER=y
4604109a111
4605> CONFIG_INOTIFY_USER=y
4606126a129
4607> CONFIG_MIPS=y
4608136d138
4609< CONFIG_MIPS=y
4610149d150
4611< CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
4612150a152,153
4613> CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
4614> # CONFIG_NATSEMI is not set
4615152d154
4616< # CONFIG_NO_IOPORT is not set
4617153a156
4618> # CONFIG_NO_IOPORT is not set
4619156a160
4620> CONFIG_PCI=y
4621157a162
4622> # CONFIG_PCSPKR_PLATFORM is not set
4623163d167
4624< CONFIG_POSIX_MQUEUE_SYSCTL=y
4625164a169
4626> CONFIG_POSIX_MQUEUE_SYSCTL=y
4627171d175
4628< CONFIG_SERIAL_BCM63XX_CONSOLE=y
4629172a177
4630> CONFIG_SERIAL_BCM63XX_CONSOLE=y
4631186a192
4632> CONFIG_SSB=y
4633189d194
4634< CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4635191c196
4636< CONFIG_SSB_PCIHOST_POSSIBLE=y
4637---
4638> CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
4639192a198
4640> CONFIG_SSB_PCIHOST_POSSIBLE=y
4641194d199
4642< CONFIG_SSB=y
4643202a208
4644> CONFIG_TICK_ONESHOT=y
4645204d209
4646< CONFIG_TRACING_SUPPORT=y
4647205a211
4648> CONFIG_TRACING_SUPPORT=y
4649diff -r WNDR4300v2-basecompare/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
4650421,427d420
4651< static struct board_info __initdata board_rta1025w_16 = {
4652< 	.name				= "RTA1025W_16",
4653< 	.expected_cpu_id		= 0x6348,
4654< 	
4655< 	.has_enet0			= 1,
4656< 	.has_enet1			= 1,
4657< 	.has_pci			= 1,
4658429,437d421
4659< 	.enet0 = {
4660< 		.has_phy		= 1,
4661< 		.use_internal_phy	= 1,
4662< 	},
4663< 	.enet1 = {
4664< 		.force_speed_100	= 1,
4665< 		.force_duplex_full	= 1,
4666< 	},
4667< };
4668605d588
4669< 	&board_rta1025w_16,
4670Le fichier WNDR4300v2-basecompare/target/linux/brcm63xx/files/arch/mips/include/asm/mach-bcm63xx est un fichier régulier alors que le fichier WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm63xx/files/arch/mips/include/asm/mach-bcm63xx est un répertoire
4671diff -r WNDR4300v2-basecompare/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
4672202,210c202,203
4673< 	    tagid = "bcram";
4674< 	    sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
4675< 	    sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
4676< 	    sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
4677< 	    sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
4678< 	    sscanf(buf->bccfe.totalLength, "%u", &totallen);
4679< 	    tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
4680< 	    tagversion = &(buf->bccfe.tagVersion[0]);
4681< 	    boardid = &(buf->bccfe.boardid[0]);
4682---
4683> 	  printk(KERN_ERR PFX "Failed to find a valid tag id\n");
4684> 	  return -EIO;
4685diff -r WNDR4300v2-basecompare/target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/brcm63xx/patches-2.6.30/060-bcm63xx_enet_upstream_fixes.patch
468611,19d10
4687< @@ -91,7 +90,7 @@
4688<  		if (enet_readl(priv, ENET_IR_REG) & ENET_IR_MII)
4689<  			break;
4690<  		udelay(1);
4691< -	} while (limit-- >= 0);
4692< +	} while (limit-- > 0);
4693<  
4694<  	return (limit < 0) ? 1 : 0;
4695<  }
4696diff -r WNDR4300v2-basecompare/target/linux/cobalt/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/cobalt/config-default
469710a11,14
4698> # CONFIG_ATA_NONSTANDARD is not set
4699> # CONFIG_ATA_PIIX is not set
4700> CONFIG_ATA_SFF=y
4701> CONFIG_BASE_SMALL=0
470224d27
4703< CONFIG_CEVT_R4K_LIB=y
470426c29
4705< CONFIG_COMPAT_BRK=y
4706---
4707> CONFIG_CEVT_R4K_LIB=y
470827a31
4709> CONFIG_COMPAT_BRK=y
471058d61
4711< CONFIG_CSRC_R4K_LIB=y
471259a63
4713> CONFIG_CSRC_R4K_LIB=y
471474d77
4715< CONFIG_FB_COBALT=y
471675a79
4717> CONFIG_FB_COBALT=y
471881d84
4719< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
472082a86
4721> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
4722103d106
4723< # CONFIG_HZ_100 is not set
4724104a108
4725> # CONFIG_HZ_100 is not set
4726105a110
4727> # CONFIG_I2C is not set
4728108d112
4729< CONFIG_INOTIFY_USER=y
4730109a114,115
4731> CONFIG_INOTIFY_USER=y
4732> CONFIG_INPUT=y
4733113d118
4734< CONFIG_INPUT=y
4735127d131
4736< CONFIG_LEGACY_PTY_COUNT=256
4737128a133
4738> CONFIG_LEGACY_PTY_COUNT=256
4739138a144
4740> CONFIG_MIPS=y
4741151d156
4742< CONFIG_MIPS=y
4743155d159
4744< # CONFIG_MTD_CFI_INTELEXT is not set
4745156a161
4746> # CONFIG_MTD_CFI_INTELEXT is not set
4747169a175
4748> CONFIG_PCI=y
4749186a193
4750> CONFIG_SCSI=y
4751189d195
4752< CONFIG_SCSI=y
4753208a215
4754> CONFIG_SYSVIPC_COMPAT=y
4755215d221
4756< CONFIG_SYSVIPC_COMPAT=y
4757217a224
4758> CONFIG_TULIP=y
4759220d226
4760< CONFIG_TULIP_NAPI_HW_MITIGATION=y
4761222c228
4762< CONFIG_TULIP=y
4763---
4764> CONFIG_TULIP_NAPI_HW_MITIGATION=y
4765227a234
4766> CONFIG_VT=y
4767230d236
4768< CONFIG_VT=y
4769diff -r WNDR4300v2-basecompare/target/linux/coldfire/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/coldfire/config-default
477010a11
4771> CONFIG_BASE_SMALL=0
477216a18
4773> CONFIG_COLDFIRE=y
477419c21,22
4775< CONFIG_COLDFIRE=y
4776---
4777> # CONFIG_DEBUG_BUGVERBOSE is not set
4778> CONFIG_FEC_548x=y
477922d24
4780< CONFIG_FEC_548x=y
478135a38
4782> # CONFIG_I2C is not set
478346d48
4784< CONFIG_M547X_8X=y
478547a50
4786> CONFIG_M547X_8X=y
478759d61
4788< # CONFIG_M68KFPU_EMU is not set
478960a63
4790> # CONFIG_M68KFPU_EMU is not set
479168a72
4792> # CONFIG_NATSEMI is not set
479372a77
4794> CONFIG_NOR_FLASH_BASE=0xE0000000
479575,76c80
4796< CONFIG_NOR_FLASH_BASE=0xE0000000
4797< CONFIG_PCI_LEGACY=y
4798---
4799> CONFIG_PCI=y
480077a82
4801> CONFIG_PCI_LEGACY=y
480286d90
4803< # CONFIG_SERIAL_COLDFIRE_IRDA is not set
480487a92
4805> # CONFIG_SERIAL_COLDFIRE_IRDA is not set
4806Seulement dans WNDR4300v2-basecompare/target/linux: ep93xx
4807diff -r WNDR4300v2-basecompare/target/linux/etrax/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/etrax/config-2.6.30
48082a3
4809> CONFIG_BASE_SMALL=0
48109d9
4811< # CONFIG_CRIS_MACH_ARTPEC3 is not set
481210a11
4813> # CONFIG_CRIS_MACH_ARTPEC3 is not set
481412a14
4815> # CONFIG_ETRAXFS is not set
481638d39
4817< # CONFIG_ETRAXFS is not set
481840d40
4819< # CONFIG_ETRAX_I2C_GVC is not set
482041a42
4821> # CONFIG_ETRAX_I2C_GVC is not set
4822102a104
4823> CONFIG_ETRAX_SERIAL=y
4824104a107
4825> CONFIG_ETRAX_SERIAL_PORT0=y
4826111d113
4827< CONFIG_ETRAX_SERIAL_PORT0=y
4828112a115
4829> CONFIG_ETRAX_SERIAL_PORT2=y
4830119c122
4831< CONFIG_ETRAX_SERIAL_PORT2=y
4832---
4833> CONFIG_ETRAX_SERIAL_PORT3=y
4834128d130
4835< CONFIG_ETRAX_SERIAL_PORT3=y
4836130d131
4837< CONFIG_ETRAX_SERIAL=y
4838148,150c149
4839< # CONFIG_MTD_CFI_INTELEXT is not set
4840< CONFIG_MTD_CONCAT=y
4841< CONFIG_MTD_MTDRAM=y
4842---
4843> # CONFIG_I2C is not set
4844153a153,155
4845> # CONFIG_MTD_CFI_INTELEXT is not set
4846> CONFIG_MTD_CONCAT=y
4847> CONFIG_MTD_MTDRAM=y
4848158d159
4849< # CONFIG_PCI is not set
4850Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux: fonera2-2.6
4851diff -r WNDR4300v2-basecompare/target/linux/gemini/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/gemini/config-default
485214a15,16
4853> # CONFIG_ATA_NONSTANDARD is not set
4854> CONFIG_BASE_SMALL=0
485519d20
4856< CONFIG_CPU_32v4=y
485720a22
4858> CONFIG_CPU_32v4=y
485926d27
4860< CONFIG_CPU_CP15_MMU=y
486127a29
4862> CONFIG_CPU_CP15_MMU=y
486333a36
4864> # CONFIG_DEBUG_BUGVERBOSE is not set
486570a74
4866> CONFIG_HDLC=m
486773d76
4868< CONFIG_HDLC=m
486976d78
4870< # CONFIG_HWMON_DEBUG_CHIP is not set
487177a80
4872> # CONFIG_HWMON_DEBUG_CHIP is not set
487378a82
4874> CONFIG_I2C=y
487581d84
4876< CONFIG_I2C=y
487788d90
4878< CONFIG_LEGACY_PTY_COUNT=256
487989a92
4880> CONFIG_LEGACY_PTY_COUNT=256
488198a102
4882> # CONFIG_NATSEMI is not set
4883103a108
4884> CONFIG_PCI=y
4885104a110
4886> CONFIG_PCI_SYSCALL=y
4887114d119
4888< # CONFIG_USB_EHCI_HCD is not set
4889115a121
4890> # CONFIG_USB_EHCI_HCD is not set
4891diff -r WNDR4300v2-basecompare/target/linux/generic-2.4/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.4/config-default
489226a27
4893> CONFIG_BINFMT_ELF=y
489429d29
4895< CONFIG_BINFMT_ELF=y
489690a91
4897> CONFIG_CRYPTO=y
4898113d113
4899< CONFIG_CRYPTO=y
4900141a142
4901> # CONFIG_FUSION is not set
4902145d145
4903< # CONFIG_FUSION is not set
4904151d150
4905< # CONFIG_HFS_FS is not set
4906152a152
4907> # CONFIG_HFS_FS is not set
4908154a155,156
4909> CONFIG_HOTPLUG=y
4910> # CONFIG_HOTPLUG_PCI is not set
4911157d158
4912< # CONFIG_HOTPLUG_PCI is not set
4913162d162
4914< CONFIG_HOTPLUG=y
4915177d176
4916< # CONFIG_INET_ECN is not set
4917178a178,179
4918> # CONFIG_INET_ECN is not set
4919> # CONFIG_INPUT is not set
4920181d181
4921< # CONFIG_INPUT is not set
4922197a198
4923> CONFIG_IP_NF_MATCH_IPRANGE=m
4924210d210
4925< CONFIG_IP_ADVANCED_ROUTER=y
4926216c216,220
4927< CONFIG_IP_MROUTE=y
4928---
4929> CONFIG_IPSEC_NAT_TRAVERSAL=y
4930> CONFIG_IPV6=m
4931> # CONFIG_IPX is not set
4932> CONFIG_IP_ADVANCED_ROUTER=y
4933> # CONFIG_IP_MROUTE is not set
4934221d224
4935< CONFIG_IP_NF_ARP_MANGLE=m
4936222a226
4937> CONFIG_IP_NF_ARP_MANGLE=m
4938244,245d247
4939< CONFIG_IP_NF_MATCH_IPRANGE=m
4940< # CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
4941246a249
4942> # CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
4943265a269
4944> CONFIG_IP_NF_NAT=m
4945270d273
4946< CONFIG_IP_NF_NAT=m
4947280a284
4948> CONFIG_IP_NF_SET=m
4949285d288
4950< CONFIG_IP_NF_SET=m
4951290d292
4952< CONFIG_IP_NF_TARGET_CLASSIFY=m
4953293a296
4954> CONFIG_IP_NF_TARGET_CLASSIFY=m
4955308,309d310
4956< # CONFIG_IP_PIMSM_V1 is not set
4957< # CONFIG_IP_PIMSM_V2 is not set
4958317,319d317
4959< CONFIG_IPSEC_NAT_TRAVERSAL=y
4960< CONFIG_IPV6=m
4961< # CONFIG_IPX is not set
4962325d322
4963< # CONFIG_JBD_DEBUG is not set
4964326a324
4965> # CONFIG_JBD_DEBUG is not set
4966332d329
4967< CONFIG_JFFS2_FS_DEBUG=0
4968333a331
4969> CONFIG_JFFS2_FS_DEBUG=0
4970359d356
4971< CONFIG_MINI_FO=y
4972360a358,360
4973> CONFIG_MINI_FO=y
4974> CONFIG_MIPS=y
4975> CONFIG_MIPS32=y
4976364d363
4977< CONFIG_MIPS32=y
4978393d391
4979< CONFIG_MIPS=y
4980396a395
4981> # CONFIG_MOMENCO_OCELOT is not set
4982399d397
4983< # CONFIG_MOMENCO_OCELOT is not set
4984401a400
4985> CONFIG_MTD=y
4986406a406
4987> CONFIG_MTD_CFI=y
4988423d422
4989< CONFIG_MTD_CFI=y
4990460d458
4991< CONFIG_MTD=y
4992464d461
4993< # CONFIG_NCP_FS is not set
4994470a468
4995> # CONFIG_NCP_FS is not set
4996472a471,476
4997> CONFIG_NET=y
4998> CONFIG_NETDEVICES=y
4999> CONFIG_NETFILTER=y
5000> # CONFIG_NETFILTER_DEBUG is not set
5001> CONFIG_NETLINK_DEV=m
5002> CONFIG_NET_CLS=y
5003475d478
5004< CONFIG_NET_CLS_ROUTE4=m
5005477c480
5006< CONFIG_NET_CLS_RSVP6=m
5007---
5008> CONFIG_NET_CLS_ROUTE4=m
5009478a482
5010> CONFIG_NET_CLS_RSVP6=m
5011481,482d484
5012< CONFIG_NET_CLS=y
5013< CONFIG_NETDEVICES=y
5014488,489d489
5015< # CONFIG_NETFILTER_DEBUG is not set
5016< CONFIG_NETFILTER=y
5017491d490
5018< # CONFIG_NET_IPGRE_BROADCAST is not set
5019492a492
5020> # CONFIG_NET_IPGRE_BROADCAST is not set
5021495d494
5022< CONFIG_NETLINK_DEV=m
5023500a500
5024> CONFIG_NET_SCHED=y
5025504d503
5026< CONFIG_NET_SCHED=y
5027518,519d516
5028< CONFIG_NET=y
5029< # CONFIG_NFS_DIRECTIO is not set
5030521d517
5031< # CONFIG_NFSD_TCP is not set
5032522a519,520
5033> # CONFIG_NFSD_TCP is not set
5034> # CONFIG_NFS_DIRECTIO is not set
5035526a525
5036> CONFIG_NLS=y
5037549a549
5038> CONFIG_NLS_ISO8859_1=m
5039553d552
5040< CONFIG_NLS_ISO8859_1=m
5041565d563
5042< CONFIG_NLS=y
5043574d571
5044< CONFIG_PACKET_MMAP=y
5045575a573
5046> CONFIG_PACKET_MMAP=y
5047588a587,588
5048> CONFIG_PPP=m
5049> CONFIG_PPPOE=m
5050593d592
5051< CONFIG_PPP=m
5052596d594
5053< CONFIG_PPPOE=m
5054618a617
5055> CONFIG_SCSI=m
5056638d636
5057< # CONFIG_SCSI_EATA_DMA is not set
5058639a638
5059> # CONFIG_SCSI_EATA_DMA is not set
5060648,649d646
5061< CONFIG_SCSI=m
5062< # CONFIG_SCSI_MEGARAID2 is not set
5063650a648
5064> # CONFIG_SCSI_MEGARAID2 is not set
5065660d657
5066< # CONFIG_SCSI_SATA_AHCI is not set
5067661a659
5068> # CONFIG_SCSI_SATA_AHCI is not set
5069676d673
5070< # CONFIG_SCx200_GPIO is not set
5071677a675
5072> # CONFIG_SCx200_GPIO is not set
5073678a677
5074> CONFIG_SERIAL=y
5075682d680
5076< CONFIG_SERIAL=y
5077696d693
5078< # CONFIG_SQUASHFS_EMBEDDED is not set
5079697a695
5080> # CONFIG_SQUASHFS_EMBEDDED is not set
5081702d699
5082< # CONFIG_SUN_PARTITION is not set
5083704a702
5084> # CONFIG_SUN_PARTITION is not set
5085707d704
5086< # CONFIG_SYSV_FS is not set
5087708a706
5088> # CONFIG_SYSV_FS is not set
5089724c722
5090< CONFIG_UNIX98_PTY_COUNT=128
5091---
5092> CONFIG_UNIX=y
5093725a724
5094> CONFIG_UNIX98_PTY_COUNT=128
5095727d725
5096< CONFIG_UNIX=y
5097734d731
5098< # CONFIG_VTAG_ICACHE is not set
5099735a733
5100> # CONFIG_VTAG_ICACHE is not set
5101739d736
5102< # CONFIG_WATCHDOG_NOWAYOUT is not set
5103740a738
5104> # CONFIG_WATCHDOG_NOWAYOUT is not set
5105751d748
5106< # CONFIG_ZISOFS_FS is not set
5107752a750
5108> # CONFIG_ZISOFS_FS is not set
5109Le fichier WNDR4300v2-basecompare/target/linux/generic-2.4/image est un fichier régulier alors que le fichier WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.4/image est un répertoire
5110Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.15
5111Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.16
5112Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.17
5113Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.18
5114Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.19
5115Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.20
5116diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/config-2.6.21 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/config-2.6.21
511760d59
5118< # CONFIG_ATA_NONSTANDARD is not set
511963d61
5120< CONFIG_ATA_SFF=y
512195d92
5122< CONFIG_BASE_SMALL=0
5123250d246
5124< # CONFIG_CPU_FREQ is not set
5125295d290
5126< # CONFIG_DEBUG_BUGVERBOSE is not set
5127432d426
5128< # CONFIG_I2C is not set
5129808d801
5130< # CONFIG_NATSEMI is not set
51311004d996
5132< # CONFIG_NVRAM is not set
51331060d1051
5134< CONFIG_PCI_SYSCALL=y
51351079d1069
5136< # CONFIG_PCSPKR_PLATFORM is not set
51371323d1312
5138< # CONFIG_SMP is not set
51391488d1476
5140< CONFIG_TICK_ONESHOT=y
5141Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.22
5142Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.23
5143Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.24
5144diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/config-2.6.25 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/config-2.6.25
514566d65
5146< # CONFIG_ATA_NONSTANDARD is not set
514769d67
5148< CONFIG_ATA_SFF=y
5149102d99
5150< CONFIG_BASE_SMALL=0
5151277d273
5152< # CONFIG_CPU_FREQ is not set
5153336d331
5154< # CONFIG_DEBUG_BUGVERBOSE is not set
5155482d476
5156< # CONFIG_I2C is not set
5157906d899
5158< # CONFIG_NATSEMI is not set
51591135d1127
5160< # CONFIG_NVRAM is not set
51611204a1197
5162> # CONFIG_PCI is not set
51631207,1208d1199
5164< CONFIG_PCI_SYSCALL=y
5165< CONFIG_PCI=y
51661226d1216
5167< # CONFIG_PCSPKR_PLATFORM is not set
51681521d1510
5169< # CONFIG_SMP is not set
51701709d1697
5171< CONFIG_TICK_ONESHOT=y
5172Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.26
5173diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/config-2.6.28
517472d71
5175< # CONFIG_ATA_NONSTANDARD is not set
517675c74
5177< CONFIG_ATA_SFF=y
5178---
5179> # CONFIG_ATA_SFF is not set
5180115d113
5181< CONFIG_BASE_SMALL=0
5182300d297
5183< # CONFIG_CPU_FREQ is not set
5184377d373
5185< # CONFIG_DEBUG_BUGVERBOSE is not set
5186577d572
5187< # CONFIG_I2C is not set
51881047d1041
5189< # CONFIG_NATSEMI is not set
51901286d1279
5191< # CONFIG_NVRAM is not set
51921361a1355
5193> # CONFIG_PCI is not set
51941366,1367d1359
5195< CONFIG_PCI_SYSCALL=y
5196< CONFIG_PCI=y
51971385d1376
5198< # CONFIG_PCSPKR_PLATFORM is not set
51991719d1709
5200< # CONFIG_SMP is not set
52011928d1917
5202< CONFIG_TICK_ONESHOT=y
5203Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.29
5204diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/config-2.6.30
52057d6
5206< # CONFIG_ACER_WMI is not set
520780d78
5208< # CONFIG_ATA_NONSTANDARD is not set
5209126d123
5210< CONFIG_BASE_SMALL=0
5211323d319
5212< # CONFIG_CPU_FREQ is not set
5213406d401
5214< # CONFIG_DEBUG_BUGVERBOSE is not set
5215411d405
5216< CONFIG_DECOMPRESS_LZMA_NEEDED=y
5217548d541
5218< # CONFIG_FCOE_FNIC is not set
5219549a543
5220> # CONFIG_FCOE_FNIC is not set
5221567d560
5222< # CONFIG_FTRACE_STARTUP_TEST is not set
5223657a651,652
5224> # CONFIG_HW_RANDOM_TIMERIOMEM is not set
5225> # CONFIG_HW_RANDOM_INTEL is not set
5226660,661d654
5227< # CONFIG_HW_RANDOM_INTEL is not set
5228< # CONFIG_HW_RANDOM_TIMERIOMEM is not set
5229692d684
5230< # CONFIG_I2C is not set
52311016,1018d1007
5232< # CONFIG_LCD_LTV350QV is not set
5233< # CONFIG_LCD_TDO24M is not set
5234< # CONFIG_LCD_VGG2432A4 is not set
52351214d1202
5236< # CONFIG_NATSEMI is not set
52371238d1225
5238< # CONFIG_NET_DROP_MONITOR is not set
52391463d1449
5240< # CONFIG_NVRAM is not set
52411542a1529
5242> # CONFIG_PCI is not set
52431548,1549d1534
5244< CONFIG_PCI_SYSCALL=y
5245< CONFIG_PCI=y
52461567d1551
5247< # CONFIG_PCSPKR_PLATFORM is not set
52481825d1808
5249< # CONFIG_SENSORS_ATK0110 is not set
52501846d1828
5251< # CONFIG_SENSORS_LIS3LV02D is not set
52521928d1909
5253< # CONFIG_SMP is not set
52542065d2045
5255< # CONFIG_SONY_LAPTOP is not set
52562082c2062
5257< CONFIG_SQUASHFS_LZMA=y
5258---
5259> CONFIG_SQUASHFS_SUPPORT_LZMA=y
52602149d2128
5261< CONFIG_TICK_ONESHOT=y
5262diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/config-2.6.31
52638d7
5264< # CONFIG_ACER_WMI is not set
526585d83
5266< # CONFIG_ATA_NONSTANDARD is not set
5267132d129
5268< CONFIG_BASE_SMALL=0
5269340d336
5270< # CONFIG_CPU_FREQ is not set
5271343d338
5272< # CONFIG_CRASH_DUMP is not set
5273424d418
5274< # CONFIG_DEBUG_BUGVERBOSE is not set
5275429d422
5276< CONFIG_DECOMPRESS_LZMA_NEEDED=y
5277565d557
5278< # CONFIG_FCOE_FNIC is not set
5279566a559
5280> # CONFIG_FCOE_FNIC is not set
5281585d577
5282< # CONFIG_FTRACE_STARTUP_TEST is not set
5283642d633
5284< # CONFIG_HID_DRAGONRISE is not set
5285645d635
5286< # CONFIG_HID_GREENASIA is not set
5287659d648
5288< # CONFIG_HID_SMARTJOYPLUS is not set
5289663d651
5290< # CONFIG_HID_THRUSTMASTER is not set
5291665d652
5292< # CONFIG_HID_ZEROPLUS is not set
5293684a672,673
5294> # CONFIG_HW_RANDOM_TIMERIOMEM is not set
5295> # CONFIG_HW_RANDOM_INTEL is not set
5296687,688d675
5297< # CONFIG_HW_RANDOM_INTEL is not set
5298< # CONFIG_HW_RANDOM_TIMERIOMEM is not set
5299719d705
5300< # CONFIG_I2C is not set
53011034,1036d1019
5302< # CONFIG_KERNEL_GZIP is not set
5303< CONFIG_KERNEL_LZMA=y
5304< # CONFIG_KERNEL_LZO is not set
53051051,1053d1033
5306< # CONFIG_LCD_LTV350QV is not set
5307< # CONFIG_LCD_TDO24M is not set
5308< # CONFIG_LCD_VGG2432A4 is not set
53091250d1229
5310< # CONFIG_NATSEMI is not set
53111274d1252
5312< # CONFIG_NET_DROP_MONITOR is not set
53131501d1478
5314< # CONFIG_NVRAM is not set
53151580a1558
5316> # CONFIG_PCI is not set
53171586,1587d1563
5318< CONFIG_PCI_SYSCALL=y
5319< CONFIG_PCI=y
53201605d1580
5321< # CONFIG_PCSPKR_PLATFORM is not set
53221686d1660
5323< # CONFIG_RD_LZO is not set
53241877d1850
5325< # CONFIG_SENSORS_ATK0110 is not set
53261898d1870
5327< # CONFIG_SENSORS_LIS3LV02D is not set
53281984d1955
5329< # CONFIG_SMP is not set
53302120d2090
5331< # CONFIG_SONY_LAPTOP is not set
53322137c2107
5333< CONFIG_SQUASHFS_LZMA=y
5334---
5335> CONFIG_SQUASHFS_SUPPORT_LZMA=y
53362205d2174
5337< CONFIG_TICK_ONESHOT=y
53382606,2607d2574
5339< # CONFIG_VMSPLIT_2G_OPT is not set
5340< # CONFIG_VMSPLIT_3G_OPT is not set
5341Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6: config-2.6.32
5342Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6: config-2.6.33
5343Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/drivers: char
5344Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/drivers: input
5345Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/drivers: leds
5346Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/drivers: spi
5347Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/drivers: ssb
5348Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/drivers: usb
5349Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/include/linux: spi
5350Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files/include/linux: ssb
5351Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/files-2.6.25/drivers/leds: leds-alix.c
5352Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/files-2.6.28/drivers/leds: leds-alix.c
5353Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/files-2.6.30/drivers/leds: leds-alix.c
5354Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files-2.6.30/drivers: net
5355Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/files-2.6.31/drivers/leds: leds-alix.c
5356Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/files-2.6.31/drivers: net
5357Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6: files-2.6.32
5358Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6: patches
5359Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.21: 024-mips_disable_fpu.patch
5360diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.21/150-netfilter_imq.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.21/150-netfilter_imq.patch
5361738c738
5362< @@ -97,6 +97,7 @@ obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ip
5363---
5364> @@ -98,6 +98,7 @@ obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ip
5365diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.21/160-netfilter_route.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.21/160-netfilter_route.patch
5366541,543c541,543
5367< @@ -684,5 +684,22 @@ config IP_NF_ARP_MANGLE
5368<  	  Allows altering the ARP packet payload: source and destination
5369<  	  hardware and network addresses.
5370---
5371> @@ -825,5 +825,22 @@ config IP_NF_TARGET_SET
5372>  	  To compile it as a module, choose M here.  If unsure, say N.
5373>  
5374566c566
5375< @@ -100,6 +100,7 @@ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_EC
5376---
5377> @@ -101,6 +101,7 @@ obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_EC
5378Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.21: 30-fix_conflicting_getline.patch
5379Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.21: 31-use_kbuild.h.patch
5380Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.21: 32-time_fix_timespec_add_ns.patch
5381diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch
538214c14
5383< @@ -228,4 +232,6 @@ struct itimerval {
5384---
5385> @@ -224,4 +228,6 @@ struct itimerval {
5386diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
5387797c797
5388< @@ -51,6 +51,7 @@ obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl
5389---
5390> @@ -52,6 +52,7 @@ obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set
5391Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.25: 401-led_alix.patch
5392diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
53933c3
5394< @@ -185,4 +185,11 @@ config LEDS_TRIGGER_MORSE
5395---
5396> @@ -191,4 +191,11 @@ config LEDS_TRIGGER_MORSE
539717c17
5398< @@ -27,3 +27,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledt
5399---
5400> @@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledt
5401diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.28/024-mips_disable_fpu.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.28/024-mips_disable_fpu.patch
540216,17c16,17
5403< +	bool "Enable FPU emulation"
5404< +	default y
5405---
5406> +	bool
5407> +	default n
5408Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.28: 401-led_alix.patch
5409diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.28/402-ledtrig_netdev.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.28/402-ledtrig_netdev.patch
54103c3
5411< @@ -221,4 +221,11 @@ config LEDS_TRIGGER_MORSE
5412---
5413> @@ -227,4 +227,11 @@ config LEDS_TRIGGER_MORSE
541417c17
5415< @@ -31,3 +31,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
5416---
5417> @@ -32,3 +32,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
5418Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.28: 981-vsprintf_backport.patch
5419Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 000-bzip_lzma_remove_nasty_hack.patch
5420Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 001-squashfs_move_zlib_decomp.patch
5421Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 002-squashfs_factor_out_remaining_zlib.patch
5422Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 003-squashfs_add_decompressor_framework.patch
5423Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 004-squashfs_add_decompressor_lzma_lzo.patch
5424Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 005-squashfs_extra_parameter.patch
5425Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 006-squashfs_add_lzma.patch
5426Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 007-squashfs_make_lzma_available.patch
5427Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30: 015-arm_export___cpu_flush_dcache_page.patch
5428diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30/025-mips_disable_fpu.patch
542916,17c16,17
5430< +	bool "Enable FPU emulation"
5431< +	default y
5432---
5433> +	bool
5434> +	default n
5435Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30: 050-pcomp_update.patch
5436Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30: 051-squashfs_pcomp.patch
5437Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30: 052-pcomp_lzma_support.patch
5438Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30: 053-squashfs_lzma.patch
5439diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30/251-atm.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30/251-atm.patch
54401,3c1,5
5441< --- a/include/linux/atm.h
5442< +++ b/include/linux/atm.h
5443< @@ -139,6 +139,9 @@ struct atm_trafprm {
5444---
5445> Index: linux-2.6.28.10/include/linux/atm.h
5446> ===================================================================
5447> --- linux-2.6.28.10.orig/include/linux/atm.h	2009-05-02 20:54:43.000000000 +0200
5448> +++ linux-2.6.28.10/include/linux/atm.h	2009-09-02 15:00:30.000000000 +0200
5449> @@ -139,6 +139,9 @@
5450diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30/402-ledtrig_netdev.patch
54519c9
5452< +	depends on NET && LEDS_TRIGGERS
5453---
5454> +	depends on LEDS_TRIGGERS
5455diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30/970-ocf_kbuild_integration.patch
54563c3
5457< @@ -778,6 +778,8 @@ config CRYPTO_ANSI_CPRNG
5458---
5459> @@ -784,6 +784,8 @@ config CRYPTO_ANSI_CPRNG
546014c14
5461< @@ -85,6 +85,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
5462---
5463> @@ -86,6 +86,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
5464diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.30/977-textsearch_kconfig_hacks.patch
54653c3
5466< @@ -145,16 +145,16 @@ config REED_SOLOMON_DEC16
5467---
5468> @@ -142,16 +142,16 @@ config REED_SOLOMON_DEC16
5469Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 001-squashfs_move_zlib_decomp.patch
5470Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 002-squashfs_factor_out_remaining_zlib.patch
5471Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 003-squashfs_add_decompressor_framework.patch
5472Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 004-squashfs_add_decompressor_lzma_lzo.patch
5473Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 005-squashfs_extra_parameter.patch
5474Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 006-squashfs_add_lzma.patch
5475Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 007-squashfs_make_lzma_available.patch
5476diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/014-samsung_flash
547711c11
5478< @@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
5479---
5480> @@ -386,12 +387,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
5481diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/025-mips_disable_fpu.patch
548216,17c16,17
5483< +	bool "Enable FPU emulation"
5484< +	default y
5485---
5486> +	bool
5487> +	default n
5488diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/028-module_exports.patch
54891,2c1,4
5490< --- a/include/asm-generic/vmlinux.lds.h
5491< +++ b/include/asm-generic/vmlinux.lds.h
5492---
5493> Index: linux-2.6.31.5/include/asm-generic/vmlinux.lds.h
5494> ===================================================================
5495> --- linux-2.6.31.5.orig/include/asm-generic/vmlinux.lds.h	2009-10-23 00:57:56.000000000 +0200
5496> +++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h	2009-10-23 12:43:50.000000000 +0200
549787,89c89,93
5498< --- a/include/linux/module.h
5499< +++ b/include/linux/module.h
5500< @@ -188,16 +188,24 @@ void *__symbol_get_gpl(const char *symbo
5501---
5502> Index: linux-2.6.31.5/include/linux/module.h
5503> ===================================================================
5504> --- linux-2.6.31.5.orig/include/linux/module.h	2009-10-23 00:57:56.000000000 +0200
5505> +++ linux-2.6.31.5/include/linux/module.h	2009-10-23 12:43:50.000000000 +0200
5506> @@ -188,16 +188,24 @@
5507116,118c120,124
5508< --- a/arch/arm/kernel/vmlinux.lds.S
5509< +++ b/arch/arm/kernel/vmlinux.lds.S
5510< @@ -79,26 +79,6 @@ SECTIONS
5511---
5512> Index: linux-2.6.31.5/arch/arm/kernel/vmlinux.lds.S
5513> ===================================================================
5514> --- linux-2.6.31.5.orig/arch/arm/kernel/vmlinux.lds.S	2009-10-23 00:57:56.000000000 +0200
5515> +++ linux-2.6.31.5/arch/arm/kernel/vmlinux.lds.S	2009-10-23 12:43:50.000000000 +0200
5516> @@ -79,26 +79,6 @@
5517145c151
5518< @@ -205,6 +185,28 @@ SECTIONS
5519---
5520> @@ -205,6 +185,28 @@
5521174,176c180,184
5522< --- a/arch/powerpc/kernel/vmlinux.lds.S
5523< +++ b/arch/powerpc/kernel/vmlinux.lds.S
5524< @@ -37,12 +37,6 @@ jiffies = jiffies_64 + 4;
5525---
5526> Index: linux-2.6.31.5/arch/powerpc/kernel/vmlinux.lds.S
5527> ===================================================================
5528> --- linux-2.6.31.5.orig/arch/powerpc/kernel/vmlinux.lds.S	2009-10-23 00:57:56.000000000 +0200
5529> +++ linux-2.6.31.5/arch/powerpc/kernel/vmlinux.lds.S	2009-10-23 12:43:50.000000000 +0200
5530> @@ -37,12 +37,6 @@
5531189c197
5532< @@ -295,6 +289,12 @@ SECTIONS
5533---
5534> @@ -295,6 +289,12 @@
5535diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch
55361,2c1,3
5537< --- a/arch/mips/kernel/Makefile
5538< +++ b/arch/mips/kernel/Makefile
5539---
5540> diff -Nru linux-2.6.31.5/arch/mips/kernel/Makefile linux-2.6.31.5.new/arch/mips/kernel/Makefile
5541> --- linux-2.6.31.5/arch/mips/kernel/Makefile	2009-10-25 12:35:46.137368384 +0200
5542> +++ linux-2.6.31.5.new/arch/mips/kernel/Makefile	2009-10-25 15:24:04.713493469 +0200
554312,14c13,16
5544< --- a/arch/mips/kernel/vmlinux.lds.S
5545< +++ b/arch/mips/kernel/vmlinux.lds.S
5546< @@ -10,15 +10,15 @@ PHDRS {
5547---
5548> diff -Nru linux-2.6.31.5/arch/mips/kernel/vmlinux.lds.S linux-2.6.31.5.new/arch/mips/kernel/vmlinux.lds.S
5549> --- linux-2.6.31.5/arch/mips/kernel/vmlinux.lds.S	2009-10-23 01:57:56.000000000 +0300
5550> +++ linux-2.6.31.5.new/arch/mips/kernel/vmlinux.lds.S	2009-10-25 15:26:11.631618513 +0200
5551> @@ -10,15 +10,15 @@
5552Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 049-byteshift_h_fix_usage_for_compressed_kernels.patch
5553Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 050-lzo_compressed_kernels.patch
5554Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 051-lzo_compressed_kernel_for_arm.patch
5555Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31: 051-squashfs_pcomp.patch
5556Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 052-lzo_compressed_kernel_for_x86.patch
5557Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31: 052-pcomp_lzma_support.patch
5558Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 053-lzo_compression_for_initramfs.patch
5559Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31: 053-squashfs_lzma.patch
5560Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31: 055-lzma_arm_kernel.patch
5561diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
55621,2c1,2
5563< --- a/include/linux/mtd/partitions.h
5564< +++ b/include/linux/mtd/partitions.h
5565---
5566> --- a/include/linux/mtd/partitions.h	2009-10-29 11:24:29.000000000 +0100
5567> +++ b/include/linux/mtd/partitions.h	2009-10-29 11:26:35.000000000 +0100
556811c11
5569< @@ -49,7 +50,6 @@ struct mtd_partition {
5570---
5571> @@ -49,7 +50,6 @@
5572diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch
55732346c2346
5574< @@ -1577,6 +2411,9 @@ int may_open(struct path *path, int acc_
5575---
5576> @@ -1575,6 +2409,9 @@ int may_open(struct path *path, int acc_
55772356c2356
5578< @@ -1623,7 +2460,7 @@ out_unlock:
5579---
5580> @@ -1621,7 +2458,7 @@ out_unlock:
55812365c2365
5582< @@ -1738,12 +2575,10 @@ struct file *do_filp_open(int dfd, const
5583---
5584> @@ -1736,12 +2573,10 @@ struct file *do_filp_open(int dfd, const
55852380c2380
5586< @@ -1803,10 +2638,23 @@ do_last:
5587---
5588> @@ -1801,10 +2636,23 @@ do_last:
55892406c2406
5590< @@ -1824,12 +2672,18 @@ ok:
5591---
5592> @@ -1822,12 +2670,18 @@ ok:
55932426c2426
5594< @@ -1904,8 +2758,7 @@ do_link:
5595---
5596> @@ -1902,8 +2756,7 @@ do_link:
55972436c2436
5598< @@ -1939,7 +2792,8 @@ EXPORT_SYMBOL(filp_open);
5599---
5600> @@ -1937,7 +2790,8 @@ EXPORT_SYMBOL(filp_open);
56012446c2446
5602< @@ -1955,11 +2809,13 @@ struct dentry *lookup_create(struct name
5603---
5604> @@ -1953,11 +2807,13 @@ struct dentry *lookup_create(struct name
56052463c2463
5606< @@ -1968,15 +2824,17 @@ struct dentry *lookup_create(struct name
5607---
5608> @@ -1966,15 +2822,17 @@ struct dentry *lookup_create(struct name
56092487c2487
5610< @@ -2088,6 +2946,7 @@ SYSCALL_DEFINE3(mknod, const char __user
5611---
5612> @@ -2086,6 +2944,7 @@ SYSCALL_DEFINE3(mknod, const char __user
56132495c2495
5614< @@ -2101,9 +2960,18 @@ int vfs_mkdir(struct inode *dir, struct 
5615---
5616> @@ -2099,9 +2958,18 @@ int vfs_mkdir(struct inode *dir, struct 
56172515c2515
5618< @@ -2149,6 +3017,212 @@ SYSCALL_DEFINE2(mkdir, const char __user
5619---
5620> @@ -2147,6 +3015,212 @@ SYSCALL_DEFINE2(mkdir, const char __user
56212728c2728
5622< @@ -2213,7 +3287,7 @@ static long do_rmdir(int dfd, const char
5623---
5624> @@ -2211,7 +3285,7 @@ static long do_rmdir(int dfd, const char
56252737c2737
5626< @@ -2235,21 +3309,24 @@ static long do_rmdir(int dfd, const char
5627---
5628> @@ -2233,21 +3307,24 @@ static long do_rmdir(int dfd, const char
56292768c2768
5630< @@ -2304,7 +3381,7 @@ static long do_unlinkat(int dfd, const c
5631---
5632> @@ -2302,7 +3379,7 @@ static long do_unlinkat(int dfd, const c
56332777c2777
5634< @@ -2319,26 +3396,29 @@ static long do_unlinkat(int dfd, const c
5635---
5636> @@ -2317,26 +3394,29 @@ static long do_unlinkat(int dfd, const c
56372814c2814
5638< @@ -2349,8 +3429,8 @@ exit1:
5639---
5640> @@ -2347,8 +3427,8 @@ exit1:
56412825c2825
5642< @@ -2686,11 +3766,96 @@ int vfs_rename(struct inode *old_dir, st
5643---
5644> @@ -2684,11 +3764,96 @@ int vfs_rename(struct inode *old_dir, st
56452923c2923
5646< @@ -2724,16 +3889,28 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
5647---
5648> @@ -2722,16 +3887,28 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
56492957c2957
5650< @@ -2742,32 +3919,44 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
5651---
5652> @@ -2740,32 +3917,44 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
5653diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/402-ledtrig_netdev.patch
56549c9
5655< +	depends on NET && LEDS_TRIGGERS
5656---
5657> +	depends on LEDS_TRIGGERS
5658diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/801-usb_serial_endpoint_size.patch
56593c3
5660< @@ -60,6 +60,7 @@ static struct usb_driver usb_serial_driv
5661---
5662> @@ -62,6 +62,7 @@ static struct usb_driver usb_serial_driv
566311c11
5664< @@ -947,7 +948,7 @@ int usb_serial_probe(struct usb_interfac
5665---
5666> @@ -946,7 +947,7 @@ int usb_serial_probe(struct usb_interfac
566720c20
5668< @@ -1381,3 +1382,5 @@ MODULE_LICENSE("GPL");
5669---
5670> @@ -1416,3 +1417,5 @@ MODULE_LICENSE("GPL");
5671diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
5672832c832
5673< @@ -2266,6 +2266,11 @@ T:	git git://git.kernel.org/pub/scm/linu
5674---
5675> @@ -2260,6 +2260,11 @@ T:	git git://git.kernel.org/pub/scm/linu
5676Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31: 960-arm_lzma_loader.patch
5677diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/970-ocf_kbuild_integration.patch
56783c3
5679< @@ -788,6 +788,8 @@ config CRYPTO_ANSI_CPRNG
5680---
5681> @@ -794,6 +794,8 @@ config CRYPTO_ANSI_CPRNG
568214c14
5683< @@ -85,6 +85,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
5684---
5685> @@ -86,6 +86,11 @@ obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_
5686diff -r WNDR4300v2-basecompare/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/generic-2.6/patches-2.6.31/977-textsearch_kconfig_hacks.patch
56873c3
5688< @@ -148,16 +148,16 @@ config REED_SOLOMON_DEC16
5689---
5690> @@ -145,16 +145,16 @@ config REED_SOLOMON_DEC16
5691Seulement dans WNDR4300v2-basecompare/target/linux/generic-2.6: patches-2.6.32
5692diff -r WNDR4300v2-basecompare/target/linux/goldfish/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/goldfish/config-2.6.30
569312d11
5694< CONFIG_ARM_THUMB=y
569513a13
5696> CONFIG_ARM_THUMB=y
569714a15
5698> CONFIG_BASE_SMALL=0
569924d24
5700< CONFIG_CPU_32v5=y
570125a26
5702> CONFIG_CPU_32v5=y
570331d31
5704< CONFIG_CPU_CP15_MMU=y
570532a33
5706> CONFIG_CPU_CP15_MMU=y
570753d53
5708< # CONFIG_DEBUG_LOCK_ALLOC is not set
570954a55
5710> # CONFIG_DEBUG_LOCK_ALLOC is not set
571174a76
5712> CONFIG_FB=y
571382d83
5714< CONFIG_FB=y
571583a85
5716> # CONFIG_FONTS is not set
571786c88
5718< # CONFIG_FONTS is not set
5719---
5720> CONFIG_FRAMEBUFFER_CONSOLE=y
572189d90
5722< CONFIG_FRAMEBUFFER_CONSOLE=y
572392d92
5724< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
572593a94
5726> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
5727115d115
5728< CONFIG_HID_SUPPORT=y
5729116a117
5730> CONFIG_HID_SUPPORT=y
5731118a120
5732> # CONFIG_I2C is not set
5733119a122
5734> CONFIG_INPUT=y
5735123a127
5736> CONFIG_INPUT_MOUSEDEV=y
5737127d130
5738< CONFIG_INPUT_MOUSEDEV=y
5739129d131
5740< CONFIG_INPUT=y
5741149a152
5742> CONFIG_MTD_UBI=y
5743154d156
5744< CONFIG_MTD_UBI=y
5745163d164
5746< # CONFIG_PCI is not set
5747165a167
5748> CONFIG_PM=y
5749168,169d169
5750< CONFIG_PM=y
5751< # CONFIG_POWER_SUPPLY_DEBUG is not set
5752170a171
5753> # CONFIG_POWER_SUPPLY_DEBUG is not set
5754179d179
5755< CONFIG_SCHED_DEBUG=y
5756180a181
5757> CONFIG_SCHED_DEBUG=y
5758186d186
5759< CONFIG_SUSPEND_FREEZER=y
5760187a188
5761> CONFIG_SUSPEND_FREEZER=y
5762188a190
5763> CONFIG_TICK_ONESHOT=y
5764198a201
5765> CONFIG_VT=y
5766201,202d203
5767< CONFIG_VT=y
5768< CONFIG_WAKELOCK_STAT=y
5769203a205
5770> CONFIG_WAKELOCK_STAT=y
5771diff -r WNDR4300v2-basecompare/target/linux/ifxmips/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ifxmips/config-2.6.30
577210a11
5773> CONFIG_BASE_SMALL=0
577416d16
5775< CONFIG_CEVT_R4K_LIB=y
577617a18
5777> CONFIG_CEVT_R4K_LIB=y
577825a27
5779> CONFIG_CPU_MIPS32=y
578028d29
5781< CONFIG_CPU_MIPS32=y
578250d50
5783< CONFIG_CSRC_R4K_LIB=y
578451a52
5785> CONFIG_CSRC_R4K_LIB=y
578658d58
5787< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
578859a60
5789> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
579078d78
5791< # CONFIG_HZ_100 is not set
579279a80
5793> # CONFIG_HZ_100 is not set
579480a82,83
5795> # CONFIG_I2C is not set
5796> CONFIG_IFXMIPS=y
579786d88
5798< CONFIG_IFXMIPS=y
579999a102
5800> CONFIG_MIPS=y
5801110d112
5802< CONFIG_MIPS=y
5803117a120
5804> # CONFIG_NATSEMI is not set
5805121a125
5806> CONFIG_PCI=y
5807122a127
5808> # CONFIG_PCSPKR_PLATFORM is not set
5809diff -r WNDR4300v2-basecompare/target/linux/ifxmips/nfs/config-2.6.26 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ifxmips/nfs/config-2.6.26
58106a7
5811> CONFIG_IP_PNP=y
581210d10
5813< CONFIG_IP_PNP=y
581415d14
5815< CONFIG_SUNRPC_GSS=y
581616a16
5817> CONFIG_SUNRPC_GSS=y
5818diff -r WNDR4300v2-basecompare/target/linux/ifxmips/nfs/config-2.6.27 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ifxmips/nfs/config-2.6.27
58196a7
5820> CONFIG_IP_PNP=y
582110d10
5822< CONFIG_IP_PNP=y
582315d14
5824< CONFIG_SUNRPC_GSS=y
582516a16
5826> CONFIG_SUNRPC_GSS=y
5827diff -r WNDR4300v2-basecompare/target/linux/ifxmips/nfs/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ifxmips/nfs/config-2.6.28
58282d1
5829< CONFIG_CRYPTO_ALGAPI2=y
58304c3
5831< CONFIG_CRYPTO_BLKCIPHER2=y
5832---
5833> CONFIG_CRYPTO_ALGAPI2=y
58345a5
5835> CONFIG_CRYPTO_BLKCIPHER2=y
58369d8
5837< CONFIG_CRYPTO_MANAGER2=y
583810a10
5839> CONFIG_CRYPTO_MANAGER2=y
584012a13
5841> CONFIG_IP_PNP=y
584216d16
5843< CONFIG_IP_PNP=y
584422d21
5845< CONFIG_SUNRPC_GSS=y
584623a23
5847> CONFIG_SUNRPC_GSS=y
5848diff -r WNDR4300v2-basecompare/target/linux/iop32x/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/iop32x/config-default
584913d12
5850< # CONFIG_ARM_THUMB is not set
585114a14
5852> # CONFIG_ARM_THUMB is not set
585319c19
5854< # CONFIG_ATMEL is not set
5855---
5856> # CONFIG_ATA_NONSTANDARD is not set
585720a21,22
5858> # CONFIG_ATMEL is not set
5859> CONFIG_BASE_SMALL=0
586031d32
5861< CONFIG_CPU_32v5=y
586232a34
5863> CONFIG_CPU_32v5=y
586435d36
5865< CONFIG_CPU_CP15_MMU=y
586636a38
5867> CONFIG_CPU_CP15_MMU=y
586842a45
5869> # CONFIG_DEBUG_BUGVERBOSE is not set
587052c55,56
5871< # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
5872---
5873> # CONFIG_E100 is not set
5874> CONFIG_E1000=y
587553a58
5876> # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
587755,56d59
5878< CONFIG_E1000=y
5879< # CONFIG_E100 is not set
588076a80
5881> CONFIG_HDLC=m
588279d82
5883< CONFIG_HDLC=m
588481d83
5885< # CONFIG_HDLC_RAW_ETH is not set
588682a85
5887> # CONFIG_HDLC_RAW_ETH is not set
588884d86
5889< # CONFIG_HWMON_DEBUG_CHIP is not set
589085a88
5891> # CONFIG_HWMON_DEBUG_CHIP is not set
589286a90
5893> CONFIG_I2C=y
589490d93
5895< CONFIG_I2C=y
5896102a106,107
5897> CONFIG_IPV6_NDISC_NODETYPE=y
5898> # CONFIG_IPV6_ROUTER_PREF is not set
5899118,119d122
5900< CONFIG_IPV6_NDISC_NODETYPE=y
5901< # CONFIG_IPV6_ROUTER_PREF is not set
5902123d125
5903< CONFIG_LEGACY_PTY_COUNT=256
5904124a127
5905> CONFIG_LEGACY_PTY_COUNT=256
5906131d133
5907< # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
5908132a135
5909> # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
5910143a147
5911> # CONFIG_NATSEMI is not set
5912152d155
5913< # CONFIG_NLS_ISO8859_15 is not set
5914153a157
5915> # CONFIG_NLS_ISO8859_15 is not set
5916156a161
5917> # CONFIG_NVRAM is not set
5918161a167
5919> CONFIG_PCI=y
5920163a170
5921> CONFIG_PCI_SYSCALL=y
5922167a175
5923> CONFIG_R8169=y
5924170d177
5925< CONFIG_R8169=y
5926180a188
5927> # CONFIG_TICK_ONESHOT is not set
5928181a190
5929> CONFIG_USB=m
5930187d195
5931< CONFIG_USB=m
5932211d218
5933< # CONFIG_WANXL is not set
5934212a220
5935> # CONFIG_WANXL is not set
5936Seulement dans WNDR4300v2-basecompare/target/linux/iop32x: patches
5937Seulement dans WNDR4300v2-basecompare/target/linux/iop32x: profiles
5938Seulement dans WNDR4300v2-basecompare/target/linux/ixp4xx/base-files/etc: config
5939diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/config-2.6.28
594018d17
5941< # CONFIG_ARM_THUMB is not set
594219a19
5943> # CONFIG_ARM_THUMB is not set
594424c24,26
5945< # CONFIG_ATMEL is not set
5946---
5947> # CONFIG_ATA_NONSTANDARD is not set
5948> # CONFIG_ATA_PIIX is not set
5949> CONFIG_ATA_SFF=y
595025a28,29
5951> # CONFIG_ATMEL is not set
5952> CONFIG_BASE_SMALL=0
595334d37
5954< CONFIG_CPU_32v5=y
595535a39
5956> CONFIG_CPU_32v5=y
595739d42
5958< CONFIG_CPU_CP15_MMU=y
595940a44
5960> CONFIG_CPU_CP15_MMU=y
596146a51
5962> # CONFIG_DEBUG_BUGVERBOSE is not set
596350d54
5964< CONFIG_DMABOUNCE_DEBUG=y
596551a56
5966> CONFIG_DMABOUNCE_DEBUG=y
596757d61
5968< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
596958a63
5970> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
597187a93
5972> CONFIG_HWMON=y
597390,91d95
5974< CONFIG_HWMON=y
5975< CONFIG_HW_RANDOM_IXP4XX=y
597692a97,98
5977> CONFIG_HW_RANDOM_IXP4XX=y
5978> CONFIG_I2C=y
597999d104
5980< CONFIG_I2C=y
5981119d123
5982< CONFIG_LEGACY_PTY_COUNT=256
5983120a125
5984> CONFIG_LEGACY_PTY_COUNT=256
5985137d141
5986< CONFIG_MACH_PRONGHORNMETRO=y
5987138a143
5988> CONFIG_MACH_PRONGHORNMETRO=y
5989159a165
5990> # CONFIG_NATSEMI is not set
5991162d167
5992< # CONFIG_NLS_ISO8859_15 is not set
5993163a169
5994> # CONFIG_NLS_ISO8859_15 is not set
5995165a172
5996> # CONFIG_NVRAM is not set
5997169a177,179
5998> # CONFIG_PATA_SCH is not set
5999> CONFIG_PCI=y
6000> CONFIG_PCI_SYSCALL=y
6001190a201
6002> CONFIG_TICK_ONESHOT=y
6003191a203
6004> # CONFIG_USB is not set
6005197d208
6006< # CONFIG_USB is not set
6007diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/config-2.6.30
600818d17
6009< # CONFIG_ARM_THUMB is not set
601019a19
6011> # CONFIG_ARM_THUMB is not set
601220a21
6013> CONFIG_BASE_SMALL=0
601424d24
6015< CONFIG_CPU_32v5=y
601625a26
6017> CONFIG_CPU_32v5=y
601829d29
6019< CONFIG_CPU_CP15_MMU=y
602030a31
6021> CONFIG_CPU_CP15_MMU=y
602237a39
6023> # CONFIG_DEBUG_BUGVERBOSE is not set
602449d50
6025< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
602650a52
6027> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
602853a56
6029> CONFIG_GPIOLIB=y
603056d58
6031< CONFIG_GPIOLIB=y
603272a75
6033> CONFIG_HWMON=y
603475,76d77
6035< CONFIG_HWMON=y
6036< CONFIG_HW_RANDOM_IXP4XX=y
603777a79,80
6038> CONFIG_HW_RANDOM_IXP4XX=y
6039> CONFIG_I2C=y
604083d85
6041< CONFIG_I2C=y
6042100d101
6043< CONFIG_LEGACY_PTY_COUNT=256
6044101a103
6045> CONFIG_LEGACY_PTY_COUNT=256
6046118d119
6047< CONFIG_MACH_PRONGHORNMETRO=y
6048119a121
6049> CONFIG_MACH_PRONGHORNMETRO=y
6050131a134
6051> # CONFIG_NATSEMI is not set
6052133a137
6053> # CONFIG_NVRAM is not set
6054136a141
6055> CONFIG_PCI=y
6056137a143
6057> CONFIG_PCI_SYSCALL=y
6058152a159
6059> CONFIG_TICK_ONESHOT=y
6060diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/config-2.6.31
606115d14
6062< # CONFIG_ARM_THUMB is not set
606316a16
6064> # CONFIG_ARM_THUMB is not set
606517a18
6066> CONFIG_BASE_SMALL=0
606721d21
6068< CONFIG_CPU_32v5=y
606922a23
6070> CONFIG_CPU_32v5=y
607126d26
6072< CONFIG_CPU_CP15_MMU=y
607327a28
6074> CONFIG_CPU_CP15_MMU=y
607535a37
6076> # CONFIG_DEBUG_BUGVERBOSE is not set
607746d47
6078< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
607947a49
6080> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
608150a53
6082> CONFIG_GPIOLIB=y
608353d55
6084< CONFIG_GPIOLIB=y
608569a72
6086> CONFIG_HWMON=y
608772,73d74
6088< CONFIG_HWMON=y
6089< CONFIG_HW_RANDOM_IXP4XX=y
609074a76,77
6091> CONFIG_HW_RANDOM_IXP4XX=y
6092> CONFIG_I2C=y
609380d82
6094< CONFIG_I2C=y
609595d96
6096< CONFIG_LEGACY_PTY_COUNT=256
609796a98
6098> CONFIG_LEGACY_PTY_COUNT=256
6099113d114
6100< CONFIG_MACH_PRONGHORNMETRO=y
6101114a116
6102> CONFIG_MACH_PRONGHORNMETRO=y
6103125a128,129
6104> # CONFIG_NATSEMI is not set
6105> # CONFIG_NVRAM is not set
6106127a132,133
6107> CONFIG_PCI=y
6108> CONFIG_PCI_SYSCALL=y
6109142a149
6110> CONFIG_TICK_ONESHOT=y
6111Seulement dans WNDR4300v2-basecompare/target/linux/ixp4xx: config-2.6.32
6112diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/config-default
611317d16
6114< # CONFIG_ARM_THUMB is not set
611518a18
6116> # CONFIG_ARM_THUMB is not set
611722c22,24
6118< # CONFIG_ATMEL is not set
6119---
6120> # CONFIG_ATA_NONSTANDARD is not set
6121> # CONFIG_ATA_PIIX is not set
6122> CONFIG_ATA_SFF=y
612323a26,27
6124> # CONFIG_ATMEL is not set
6125> CONFIG_BASE_SMALL=0
612634d37
6127< CONFIG_CPU_32v5=y
612835a39
6129> CONFIG_CPU_32v5=y
613039d42
6131< CONFIG_CPU_CP15_MMU=y
613240a44
6133> CONFIG_CPU_CP15_MMU=y
613447a52
6135> # CONFIG_DEBUG_BUGVERBOSE is not set
613653d57
6137< CONFIG_DMABOUNCE_DEBUG=y
613854a59
6139> CONFIG_DMABOUNCE_DEBUG=y
614057d61
6141< # CONFIG_E1000E_ENABLED is not set
614258a63
6143> # CONFIG_E1000E_ENABLED is not set
614464d68
6145< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
614665a70
6147> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
614879a85
6149> CONFIG_HDLC=m
615082d87
6151< CONFIG_HDLC=m
615284d88
6153< # CONFIG_HDLC_RAW_ETH is not set
615485a90
6155> # CONFIG_HDLC_RAW_ETH is not set
615688a94
6157> CONFIG_HWMON=y
615891,92d96
6159< CONFIG_HWMON=y
6160< CONFIG_HW_RANDOM_IXP4XX=y
616193a98,99
6162> CONFIG_HW_RANDOM_IXP4XX=y
6163> CONFIG_I2C=y
616499d104
6165< CONFIG_I2C=y
6166102d106
6167< # CONFIG_INPUT_IXP4XX_BEEPER is not set
6168103a108
6169> # CONFIG_INPUT_IXP4XX_BEEPER is not set
6170111a117,118
6171> CONFIG_IPV6_NDISC_NODETYPE=y
6172> # CONFIG_IPV6_ROUTER_PREF is not set
6173127,128d133
6174< CONFIG_IPV6_NDISC_NODETYPE=y
6175< # CONFIG_IPV6_ROUTER_PREF is not set
6176141d145
6177< CONFIG_LEGACY_PTY_COUNT=256
6178142a147
6179> CONFIG_LEGACY_PTY_COUNT=256
6180158d162
6181< CONFIG_MACH_PRONGHORNMETRO=y
6182159a164
6183> CONFIG_MACH_PRONGHORNMETRO=y
6184180a186
6185> # CONFIG_NATSEMI is not set
6186188d193
6187< # CONFIG_NLS_ISO8859_15 is not set
6188189a195
6189> # CONFIG_NLS_ISO8859_15 is not set
6190191a198
6191> # CONFIG_NVRAM is not set
6192195a203
6193> # CONFIG_PATA_SCH is not set
6194196a205
6195> CONFIG_PCI=y
6196198a208
6197> CONFIG_PCI_SYSCALL=y
6198217a228
6199> CONFIG_TICK_ONESHOT=y
6200218a230
6201> CONFIG_USB=m
6202224d235
6203< CONFIG_USB=m
6204238d248
6205< # CONFIG_WANXL is not set
6206239a250
6207> # CONFIG_WANXL is not set
6208diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/harddisk/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/harddisk/config-default
62091,2d0
6210< CONFIG_ATA=y
6211< CONFIG_BLK_DEV_SD=y
62124,7c2
6213< CONFIG_EXT2_FS=y
6214< CONFIG_EXT3_FS=y
6215< CONFIG_JBD=y
6216< CONFIG_REISERFS_FS=y
6217---
6218> CONFIG_ATA=y
62199d3
6220< CONFIG_USB_ARCH_HAS_EHCI=y
622111a6,7
6222> CONFIG_USB_ARCH_HAS_EHCI=y
6223> CONFIG_USB=y
622413d8
6225< CONFIG_USB_EHCI_ROOT_HUB_TT=y
622614a10
6227> CONFIG_USB_EHCI_ROOT_HUB_TT=y
622819c15,19
6229< CONFIG_USB=y
6230---
6231> CONFIG_EXT2_FS=y
6232> CONFIG_EXT3_FS=y
6233> CONFIG_JBD=y
6234> CONFIG_BLK_DEV_SD=y
6235> CONFIG_REISERFS_FS=y
6236Seulement dans WNDR4300v2-basecompare/target/linux/ixp4xx/image: apex
6237diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/Makefile
623811a12
6239> CUSTOMER:=openwrt
6240diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/patches-2.6.28/304-ixp4xx_eth_jumboframe.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/patches-2.6.28/304-ixp4xx_eth_jumboframe.patch
62418c8
6242< +#define MAX_MRU			(14320 - ETH_HLEN - ETH_FCS_LEN)
6243---
6244> +#define MAX_MRU			(16320 - ETH_HLEN - ETH_FCS_LEN)
6245diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
62468c8
6247< +#define MAX_MRU			(14320 - ETH_HLEN - ETH_FCS_LEN)
6248---
6249> +#define MAX_MRU			(16320 - ETH_HLEN - ETH_FCS_LEN)
6250diff -r WNDR4300v2-basecompare/target/linux/ixp4xx/patches-2.6.31/304-ixp4xx_eth_jumboframe.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ixp4xx/patches-2.6.31/304-ixp4xx_eth_jumboframe.patch
62518c8
6252< +#define MAX_MRU			(14320 - ETH_HLEN - ETH_FCS_LEN)
6253---
6254> +#define MAX_MRU			(16320 - ETH_HLEN - ETH_FCS_LEN)
6255Seulement dans WNDR4300v2-basecompare/target/linux/ixp4xx: patches-2.6.32
6256diff -r WNDR4300v2-basecompare/target/linux/kirkwood/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/kirkwood/config-default
625714a15,18
6258> # CONFIG_ATA_NONSTANDARD is not set
6259> # CONFIG_ATA_PIIX is not set
6260> CONFIG_ATA_SFF=y
6261> CONFIG_BASE_SMALL=0
626235a40
6263> # CONFIG_DEBUG_BUGVERBOSE is not set
6264115a121
6265> # CONFIG_NATSEMI is not set
6266126a133
6267> # CONFIG_NVRAM is not set
6268130a138
6269> # CONFIG_PATA_SCH is not set
6270131a140,141
6271> CONFIG_PCI_SYSCALL=y
6272> CONFIG_PCI=y
6273143a154
6274> CONFIG_TICK_ONESHOT=y
6275diff -r WNDR4300v2-basecompare/target/linux/mpc52xx/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/mpc52xx/config-2.6.30
627622a23
6277> CONFIG_BASE_SMALL=0
627830d30
6279< CONFIG_CMDLINE_BOOL=y
628031a32
6281> CONFIG_CMDLINE_BOOL=y
628232a34,35
6283> # CONFIG_CPU_FREQ is not set
6284> # CONFIG_CRASH_DUMP is not set
628534d36
6286< CONFIG_CRYPTO_BLKCIPHER2=y
628735a38
6288> CONFIG_CRYPTO_BLKCIPHER2=y
628938d40
6290< CONFIG_CRYPTO_HASH2=y
629139a42
6292> CONFIG_CRYPTO_HASH2=y
629341d43
6294< CONFIG_CRYPTO_MANAGER2=y
629542a45
6296> CONFIG_CRYPTO_MANAGER2=y
629746a50
6298> # CONFIG_DEBUG_BUGVERBOSE is not set
629963d66
6300< CONFIG_FEC_MPC52xx_MDIO=y
630164a68
6302> CONFIG_FEC_MPC52xx_MDIO=y
630370d73
6304< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
630571a75
6306> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
630781d84
6308< # CONFIG_GEN_RTC_X is not set
630982a86
6310> # CONFIG_GEN_RTC_X is not set
6311105d108
6312< CONFIG_HAVE_MLOCKED_PAGE_BIT=y
6313106a110
6314> CONFIG_HAVE_MLOCKED_PAGE_BIT=y
6315112d115
6316< # CONFIG_HZ_100 is not set
6317113a117
6318> # CONFIG_HZ_100 is not set
6319114a119
6320> # CONFIG_I2C is not set
6321118d122
6322< CONFIG_INOTIFY_USER=y
6323119a124
6324> CONFIG_INOTIFY_USER=y
6325123d127
6326< # CONFIG_IP_ADVANCED_ROUTER is not set
6327124a129
6328> # CONFIG_IP_ADVANCED_ROUTER is not set
6329125a131
6330> CONFIG_IP_PNP=y
6331129,130d134
6332< CONFIG_IP_PNP=y
6333< CONFIG_IRQ_PER_CPU=y
6334131a136
6335> CONFIG_IRQ_PER_CPU=y
6336135d139
6337< CONFIG_LEGACY_PTY_COUNT=256
6338136a141
6339> CONFIG_LEGACY_PTY_COUNT=256
6340151a157,158
6341> # CONFIG_NVRAM is not set
6342> CONFIG_OF=y
6343154d160
6344< CONFIG_OF=y
6345159c165
6346< CONFIG_PCI_DOMAINS=y
6347---
6348> CONFIG_PCI=y
6349160a167
6350> CONFIG_PCI_DOMAINS=y
6351161a169
6352> CONFIG_PCI_SYSCALL=y
6353163a172
6354> CONFIG_PM=y
6355166c175,177
6356< CONFIG_PM=y
6357---
6358> CONFIG_PPC=y
6359> CONFIG_PPC32=y
6360> # CONFIG_PPC64 is not set
6361169d179
6362< CONFIG_PPC32=y
6363171d180
6364< # CONFIG_PPC64 is not set
6365179d187
6366< CONFIG_PPC_BESTCOMM_FEC=y
6367180a189
6368> CONFIG_PPC_BESTCOMM_FEC=y
6369204d212
6370< CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
6371205a214
6372> CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
6373209d217
6374< CONFIG_PPC_STD_MMU_32=y
6375210a219
6376> CONFIG_PPC_STD_MMU_32=y
6377212d220
6378< CONFIG_PPC=y
6379227,228d234
6380< CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
6381< CONFIG_SERIAL_MPC52xx_CONSOLE=y
6382229a236,237
6383> CONFIG_SERIAL_MPC52xx_CONSOLE=y
6384> CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
6385232a241
6386> # CONFIG_SMP is not set
6387236d244
6388< CONFIG_SUSPEND_FREEZER=y
6389237a246
6390> CONFIG_SUSPEND_FREEZER=y
6391239d247
6392< CONFIG_SYSFS_DEPRECATED_V2=y
6393240a249
6394> CONFIG_SYSFS_DEPRECATED_V2=y
6395244a254
6396> CONFIG_TICK_ONESHOT=y
6397Seulement dans WNDR4300v2-basecompare/target/linux/mpc52xx: patches-2.6.30
6398Seulement dans WNDR4300v2-basecompare/target/linux: mpc83xx
6399diff -r WNDR4300v2-basecompare/target/linux/octeon/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/octeon/config-default
640018a19
6401> CONFIG_BASE_SMALL=0
6402146a148
6403> # CONFIG_I2C is not set
6404189a192
6405> # CONFIG_NATSEMI is not set
6406200a204
6407> CONFIG_PCI=y
6408202a207
6409> # CONFIG_PCSPKR_PLATFORM is not set
6410diff -r WNDR4300v2-basecompare/target/linux/olpc/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/olpc/config-2.6.30
64112a3
6412> CONFIG_ACPI=y
641315d15
6414< CONFIG_ACPI_PROC_EVENT=y
641517a18
6416> CONFIG_ACPI_PROC_EVENT=y
641724d24
6418< CONFIG_ACPI=y
641952a53
6420> CONFIG_BASE_SMALL=0
642159d59
6422< CONFIG_BLK_DEV_SR_VENDOR=y
642360a61
6424> CONFIG_BLK_DEV_SR_VENDOR=y
642575a77
6426> CONFIG_CPU_FREQ=y
642787d88
6428< # CONFIG_CPU_FREQ_STAT_DETAILS is not set
642988a90
6430> # CONFIG_CPU_FREQ_STAT_DETAILS is not set
643190c92
6432< CONFIG_CPU_FREQ=y
6433---
6434> CONFIG_CPU_IDLE=y
643593d94
6436< CONFIG_CPU_IDLE=y
6437109a111
6438> # CONFIG_DEBUG_BUGVERBOSE is not set
6439116d117
6440< # CONFIG_DEBUG_LOCK_ALLOC is not set
6441117a119
6442> # CONFIG_DEBUG_LOCK_ALLOC is not set
6443143d144
6444< CONFIG_DMIID=y
6445144a146
6446> CONFIG_DMIID=y
6447147d148
6448< # CONFIG_EARLY_PRINTK_DBGP is not set
6449148a150
6450> # CONFIG_EARLY_PRINTK_DBGP is not set
6451156a159
6452> CONFIG_FB=y
6453160c163
6454< # CONFIG_FB_GEODE_GX1 is not set
6455---
6456> CONFIG_FB_GEODE=y
6457161a165
6458> # CONFIG_FB_GEODE_GX1 is not set
6459163,164d166
6460< CONFIG_FB_GEODE=y
6461< CONFIG_FB=y
6462168a171
6463> # CONFIG_FONTS is not set
6464171c174
6465< # CONFIG_FONTS is not set
6466---
6467> CONFIG_FRAMEBUFFER_CONSOLE=y
6468174d176
6469< CONFIG_FRAMEBUFFER_CONSOLE=y
6470180a183
6471> CONFIG_GENERIC_CLOCKEVENTS=y
6472183d185
6473< CONFIG_GENERIC_CLOCKEVENTS=y
6474211d212
6475< CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
6476212a214
6477> CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
6478221d222
6479< CONFIG_HAVE_KVM_IRQCHIP=y
6480222a224
6481> CONFIG_HAVE_KVM_IRQCHIP=y
6482230d231
6483< CONFIG_HID_SUPPORT=y
6484231a233
6485> CONFIG_HID_SUPPORT=y
6486234d235
6487< CONFIG_HPET_EMULATE_RTC=y
6488235a237
6489> CONFIG_HPET_EMULATE_RTC=y
6490239a242
6491> CONFIG_HW_RANDOM=y
6492244c247
6493< CONFIG_HW_RANDOM=y
6494---
6495> # CONFIG_I2C is not set
6496247a251
6497> CONFIG_INPUT=y
6498249a254,255
6499> CONFIG_INPUT_MOUSE=y
6500> CONFIG_INPUT_MOUSEDEV=y
6501253,255d258
6502< CONFIG_INPUT_MOUSEDEV=y
6503< CONFIG_INPUT_MOUSE=y
6504< CONFIG_INPUT=y
6505257a261,262
6506> # CONFIG_IOMMU_API is not set
6507> # CONFIG_IOMMU_HELPER is not set
6508266,268d270
6509< # CONFIG_IOMMU_API is not set
6510< # CONFIG_IOMMU_HELPER is not set
6511< CONFIG_ISA_DMA_API=y
6512269a272
6513> CONFIG_ISA_DMA_API=y
6514272d274
6515< # CONFIG_KALLSYMS_ALL is not set
6516273a276
6517> # CONFIG_KALLSYMS_ALL is not set
6518277d279
6519< # CONFIG_KEXEC_JUMP is not set
6520278a281
6521> # CONFIG_KEXEC_JUMP is not set
6522315a319
6523> CONFIG_MMC=y
6524318d321
6525< CONFIG_MMC=y
6526320a324
6527> CONFIG_MOUSE_PS2=y
6528329d332
6529< CONFIG_MOUSE_PS2=y
6530333d335
6531< # CONFIG_MPENTIUMIII is not set
6532334a337
6533> # CONFIG_MPENTIUMIII is not set
6534348a352
6535> # CONFIG_NETWORK_FILESYSTEMS is not set
6536351d354
6537< # CONFIG_NETWORK_FILESYSTEMS is not set
6538353d355
6539< CONFIG_NO_HZ=y
6540354a357
6541> CONFIG_NO_HZ=y
6542366a370,371
6543> CONFIG_PCI=y
6544> # CONFIG_PCIEPORTBUS is not set
6545370d374
6546< # CONFIG_PCIEPORTBUS is not set
6547380a385
6548> CONFIG_PM=y
6549386c391
6550< CONFIG_PM=y
6551---
6552> CONFIG_PNP=y
6553389,390d393
6554< CONFIG_PNP=y
6555< # CONFIG_POWER_SUPPLY_DEBUG is not set
6556391a395
6557> # CONFIG_POWER_SUPPLY_DEBUG is not set
6558406a411
6559> CONFIG_SCHEDSTATS=y
6560410d414
6561< CONFIG_SCHEDSTATS=y
6562416a421
6563> CONFIG_SERIO=y
6564423d427
6565< CONFIG_SERIO=y
6566424a429
6567> # CONFIG_SMP is not set
6568426d430
6569< # CONFIG_SPARSE_IRQ is not set
6570427a432
6571> # CONFIG_SPARSE_IRQ is not set
6572430d434
6573< CONFIG_SUSPEND_FREEZER=y
6574431a436
6575> CONFIG_SUSPEND_FREEZER=y
6576436a442
6577> CONFIG_TICK_ONESHOT=y
6578440d445
6579< CONFIG_TRACING_SUPPORT=y
6580441a447
6581> CONFIG_TRACING_SUPPORT=y
6582442a449
6583> CONFIG_USB=y
6584452d458
6585< CONFIG_USB=y
6586454d459
6587< CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
6588455a461
6589> CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
6590458d463
6591< CONFIG_VM_EVENT_COUNTERS=y
6592460a466,467
6593> CONFIG_VM_EVENT_COUNTERS=y
6594> CONFIG_VT=y
6595463d469
6596< CONFIG_VT=y
6597465c471
6598< CONFIG_X86_32_LAZY_GS=y
6599---
6600> CONFIG_X86=y
6601466a473
6602> CONFIG_X86_32_LAZY_GS=y
6603472c479
6604< # CONFIG_X86_CPU_DEBUG is not set
6605---
6606> CONFIG_X86_CPU=y
6607475c482
6608< CONFIG_X86_CPU=y
6609---
6610> # CONFIG_X86_CPU_DEBUG is not set
6611479d485
6612< # CONFIG_X86_E_POWERSAVER is not set
6613480a487
6614> # CONFIG_X86_E_POWERSAVER is not set
6615521d527
6616< CONFIG_X86=y
6617diff -r WNDR4300v2-basecompare/target/linux/olpc/image/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/olpc/image/Makefile
661814c14
6619< ROOTDELAY=10
6620---
6621> ROOTDELAY=5
6622diff -r WNDR4300v2-basecompare/target/linux/orion/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/orion/config-default
662311d10
6624< # CONFIG_ARM_THUMB is not set
662512a12
6626> # CONFIG_ARM_THUMB is not set
662716c16,18
6628< # CONFIG_ATMEL is not set
6629---
6630> # CONFIG_ATA_NONSTANDARD is not set
6631> # CONFIG_ATA_PIIX is not set
6632> CONFIG_ATA_SFF=y
663317a20,21
6634> # CONFIG_ATMEL is not set
6635> CONFIG_BASE_SMALL=0
663628d31
6637< CONFIG_CPU_32v5=y
663829a33
6639> CONFIG_CPU_32v5=y
664033d36
6641< CONFIG_CPU_CP15_MMU=y
664234a38
6643> CONFIG_CPU_CP15_MMU=y
664436d39
6645< CONFIG_CPU_FEROCEON_OLD_ID=y
664637a41
6647> CONFIG_CPU_FEROCEON_OLD_ID=y
664842a47
6649> # CONFIG_DEBUG_BUGVERBOSE is not set
665050d54
6651< # CONFIG_E1000E_ENABLED is not set
665251a56
6653> # CONFIG_E1000E_ENABLED is not set
665457d61
6655< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
665658a63
6657> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
665872a78
6659> CONFIG_HDLC=m
666075d80
6661< CONFIG_HDLC=m
666277d81
6663< # CONFIG_HDLC_RAW_ETH is not set
666478a83
6665> # CONFIG_HDLC_RAW_ETH is not set
666680d84
6667< # CONFIG_HWMON_DEBUG_CHIP is not set
666881a86
6669> # CONFIG_HWMON_DEBUG_CHIP is not set
667082a88
6671> CONFIG_I2C=y
667286d91
6673< CONFIG_I2C=y
667496a102,104
6675> # CONFIG_IPV6_MROUTE is not set
6676> CONFIG_IPV6_NDISC_NODETYPE=y
6677> # CONFIG_IPV6_ROUTER_PREF is not set
6678112,114d119
6679< # CONFIG_IPV6_MROUTE is not set
6680< CONFIG_IPV6_NDISC_NODETYPE=y
6681< # CONFIG_IPV6_ROUTER_PREF is not set
6682118d122
6683< CONFIG_LEGACY_PTY_COUNT=256
6684119a124
6685> CONFIG_LEGACY_PTY_COUNT=256
6686130d134
6687< # CONFIG_MACH_MSS2 is not set
6688131a136
6689> # CONFIG_MACH_MSS2 is not set
6690142d146
6691< # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
6692143a148
6693> # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
6694152a158
6695> CONFIG_MTD_PHYSMAP=y
6696156d161
6697< CONFIG_MTD_PHYSMAP=y
6698158a164
6699> # CONFIG_NATSEMI is not set
6700170d175
6701< # CONFIG_NLS_ISO8859_15 is not set
6702171a177
6703> # CONFIG_NLS_ISO8859_15 is not set
6704173a180
6705> # CONFIG_NVRAM is not set
6706178a186
6707> # CONFIG_PATA_SCH is not set
6708179a188
6709> CONFIG_PCI=y
6710181a191
6711> CONFIG_PCI_SYSCALL=y
6712196a207
6713> CONFIG_TICK_ONESHOT=y
6714197a209,210
6715> CONFIG_USB=m
6716> # CONFIG_USBPCWATCHDOG is not set
6717205d217
6718< CONFIG_USB=m
6719209d220
6720< # CONFIG_USBPCWATCHDOG is not set
6721227d237
6722< # CONFIG_USB_VIDEO_CLASS is not set
6723234d243
6724< # CONFIG_VIDEO_SAA717X is not set
6725236c245,246
6726< # CONFIG_WANXL is not set
6727---
6728> # CONFIG_VIDEO_SAA717X is not set
6729> # CONFIG_USB_VIDEO_CLASS is not set
6730237a248
6731> # CONFIG_WANXL is not set
6732diff -r WNDR4300v2-basecompare/target/linux/orion/harddisk/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/orion/harddisk/config-default
67330a1,3
6734> CONFIG_SWAP=y
6735> CONFIG_LBD=y
6736> CONFIG_BLK_DEV_SD=y
67372c5,6
6738< CONFIG_BLK_DEV_DM=y
6739---
6740> CONFIG_SATA_MV=y
6741> CONFIG_MD=y
67424,16d7
6743< CONFIG_BLK_DEV_SD=y
6744< # CONFIG_DM_CRYPT is not set
6745< # CONFIG_DM_DEBUG is not set
6746< # CONFIG_DM_DELAY is not set
6747< # CONFIG_DM_MIRROR is not set
6748< # CONFIG_DM_MULTIPATH is not set
6749< # CONFIG_DM_SNAPSHOT is not set
6750< # CONFIG_DM_UEVENT is not set
6751< # CONFIG_DM_ZERO is not set
6752< CONFIG_EXT2_FS=y
6753< CONFIG_EXT3_FS=y
6754< CONFIG_JBD=y
6755< CONFIG_LBD=y
675618d8
6757< # CONFIG_MD_FAULTY is not set
675820d9
6759< # CONFIG_MD_MULTIPATH is not set
676022d10
6761< # CONFIG_MD_RAID10 is not set
676223a12
6763> # CONFIG_MD_RAID10 is not set
676425,28c14,24
6765< CONFIG_MD=y
6766< CONFIG_SATA_MV=y
6767< CONFIG_SWAP=y
6768< CONFIG_USB_ARCH_HAS_EHCI=y
6769---
6770> # CONFIG_MD_MULTIPATH is not set
6771> # CONFIG_MD_FAULTY is not set
6772> CONFIG_BLK_DEV_DM=y
6773> # CONFIG_DM_DEBUG is not set
6774> # CONFIG_DM_CRYPT is not set
6775> # CONFIG_DM_SNAPSHOT is not set
6776> # CONFIG_DM_MIRROR is not set
6777> # CONFIG_DM_ZERO is not set
6778> # CONFIG_DM_MULTIPATH is not set
6779> # CONFIG_DM_DELAY is not set
6780> # CONFIG_DM_UEVENT is not set
678130a27,28
6782> CONFIG_USB_ARCH_HAS_EHCI=y
6783> CONFIG_USB=y
678435c33,35
6785< CONFIG_USB=y
6786---
6787> CONFIG_EXT2_FS=y
6788> CONFIG_EXT3_FS=y
6789> CONFIG_JBD=y
6790Seulement dans WNDR4300v2-basecompare/target/linux/orion: profiles
6791Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux: pb44-2.6
6792diff -r WNDR4300v2-basecompare/target/linux/ppc40x/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ppc40x/config-default
67935d4
6794< CONFIG_4xx_SOC=y
67956a6
6796> CONFIG_4xx_SOC=y
679723a24
6798> CONFIG_BASE_SMALL=0
679929d29
6800< CONFIG_CMDLINE_BOOL=y
680130a31
6802> CONFIG_CMDLINE_BOOL=y
680331a33
6804> # CONFIG_CPU_FREQ is not set
680537a40
6806> # CONFIG_DEBUG_BUGVERBOSE is not set
680750d52
6808< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
680951a54
6810> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
681186d88
6812< # CONFIG_HZ_100 is not set
681387a90
6814> # CONFIG_HZ_100 is not set
681588a92,93
6816> # CONFIG_I2C is not set
6817> CONFIG_IBM_NEW_EMAC=y
681897d101
6819< CONFIG_IBM_NEW_EMAC=y
6820101d104
6821< CONFIG_IRQ_PER_CPU=y
6822102a106
6823> CONFIG_IRQ_PER_CPU=y
6824120a125
6825> # CONFIG_NATSEMI is not set
6826121a127,128
6827> # CONFIG_NVRAM is not set
6828> CONFIG_OF=y
6829124d130
6830< CONFIG_OF=y
6831128,129c134
6832< CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
6833< CONFIG_PCI_DOMAINS=y
6834---
6835> CONFIG_PCI=y
6836131a137,138
6837> CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
6838> CONFIG_PCI_DOMAINS=y
6839132a140
6840> CONFIG_PCI_SYSCALL=y
6841133a142
6842> CONFIG_PPC=y
6843143a153
6844> CONFIG_PPC_DCR=y
6845146d155
6846< CONFIG_PPC_DCR=y
6847151d159
6848< # CONFIG_PPC_MM_SLICES is not set
6849152a161
6850> # CONFIG_PPC_MM_SLICES is not set
6851159d167
6852< CONFIG_PPC=y
6853176a185
6854> CONFIG_TICK_ONESHOT=y
6855diff -r WNDR4300v2-basecompare/target/linux/ppc40x/image/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ppc40x/image/Makefile
685614c14
6857< 	$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb
6858---
6859> 	dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb
6860diff -r WNDR4300v2-basecompare/target/linux/ppc44x/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ppc44x/config-default
68615d4
6862< CONFIG_4xx_SOC=y
68636a6
6864> CONFIG_4xx_SOC=y
686510a11
6866> # CONFIG_ARCHES is not set
686713d13
6868< # CONFIG_ARCHES is not set
686924a25
6870> CONFIG_BASE_SMALL=0
687126d26
6872< # CONFIG_BOOKE_WDT is not set
687327a28
6874> # CONFIG_BOOKE_WDT is not set
687532d32
6876< CONFIG_CMDLINE_BOOL=y
687733a34
6878> CONFIG_CMDLINE_BOOL=y
687935a37,38
6880> # CONFIG_CPU_FREQ is not set
6881> # CONFIG_DEBUG_BUGVERBOSE is not set
688246d48
6883< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
688447a50
6885> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
688677d79
6887< # CONFIG_HZ_100 is not set
688878a81
6889> # CONFIG_HZ_100 is not set
689079a83,84
6891> # CONFIG_I2C is not set
6892> CONFIG_IBM_NEW_EMAC=y
689389d93
6894< CONFIG_IBM_NEW_EMAC=y
689595d98
6896< CONFIG_IRQ_PER_CPU=y
689796a100
6898> CONFIG_IRQ_PER_CPU=y
6899111a116
6900> # CONFIG_NATSEMI is not set
6901112a118,119
6902> # CONFIG_NVRAM is not set
6903> CONFIG_OF=y
6904115d121
6905< CONFIG_OF=y
6906118,119c124
6907< CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
6908< CONFIG_PCI_DOMAINS=y
6909---
6910> CONFIG_PCI=y
6911122a128,129
6912> CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
6913> CONFIG_PCI_DOMAINS=y
6914123a131,132
6915> CONFIG_PCI_SYSCALL=y
6916> CONFIG_PHYSICAL_START=0x00000000
6917126c135
6918< CONFIG_PHYSICAL_START=0x00000000
6919---
6920> CONFIG_PPC=y
6921136a146
6922> CONFIG_PPC_DCR=y
6923139d148
6924< CONFIG_PPC_DCR=y
6925151d159
6926< CONFIG_PPC=y
6927172c180,181
6928< CONFIG_USB_EHCI_HCD_PPC_OF=y
6929---
6930> CONFIG_TICK_ONESHOT=y
6931> CONFIG_USB_SUPPORT=y
6932173a183,184
6933> CONFIG_USB_EHCI_HCD_PPC_OF=y
6934> CONFIG_USB_OHCI_HCD_PPC_OF=y
6935176,177d186
6936< CONFIG_USB_OHCI_HCD_PPC_OF=y
6937< CONFIG_USB_SUPPORT=y
6938diff -r WNDR4300v2-basecompare/target/linux/ppc44x/image/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ppc44x/image/Makefile
693914c14
6940< 	$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb
6941---
6942> 		dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb
6943diff -r WNDR4300v2-basecompare/target/linux/ppc44x/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ppc44x/Makefile
694412a13
6945> CUSTOMER:=openwrt
6946Seulement dans WNDR4300v2-basecompare/target/linux/ppc44x: profiles
6947diff -r WNDR4300v2-basecompare/target/linux/ps3/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ps3/config-2.6.30
694820a21
6949> CONFIG_BASE_SMALL=0
695023a25
6951> CONFIG_BLK_DEV_RAM=y
695226d27
6953< CONFIG_BLK_DEV_RAM=y
695428d28
6955< # CONFIG_BLK_DEV_SR_VENDOR is not set
695629a30
6957> # CONFIG_BLK_DEV_SR_VENDOR is not set
695837a39
6959> CONFIG_COMPAT=y
696040d41
6961< CONFIG_COMPAT=y
696241a43,44
6963> # CONFIG_CPU_FREQ is not set
6964> # CONFIG_CRASH_DUMP is not set
696543a47
6966> # CONFIG_DEBUG_BUGVERBOSE is not set
696757d60
6968< # CONFIG_EXT4_FS_XATTR is not set
696958a62
6970> # CONFIG_EXT4_FS_XATTR is not set
697161c65
6972< CONFIG_FB_PS3_DEFAULT_SIZE_M=9
6973---
6974> CONFIG_FB=y
697562a67
6976> CONFIG_FB_PS3_DEFAULT_SIZE_M=9
697767d71
6978< CONFIG_FB=y
697969a74
6980> # CONFIG_FONTS is not set
698172d76
6982< # CONFIG_FONTS is not set
698373a78
6984> CONFIG_FRAMEBUFFER_CONSOLE=y
698576d80
6986< CONFIG_FRAMEBUFFER_CONSOLE=y
698782d85
6988< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
698983a87
6990> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
6991118a123
6992> CONFIG_HID=y
6993128d132
6994< CONFIG_HID=y
6995133d136
6996< # CONFIG_HZ_100 is not set
6997134a138
6998> # CONFIG_HZ_100 is not set
6999135a140
7000> # CONFIG_I2C is not set
7001138d142
7002< CONFIG_INOTIFY_USER=y
7003139a144,145
7004> CONFIG_INOTIFY_USER=y
7005> CONFIG_INPUT=y
7006141a148
7007> CONFIG_INPUT_MOUSEDEV=y
7008145,146d151
7009< CONFIG_INPUT_MOUSEDEV=y
7010< CONFIG_INPUT=y
7011150d154
7012< # CONFIG_IP_ADVANCED_ROUTER is not set
7013151a156
7014> # CONFIG_IP_ADVANCED_ROUTER is not set
7015152a158
7016> # CONFIG_IRQSTACKS is not set
7017155d160
7018< # CONFIG_IRQSTACKS is not set
7019159d163
7020< CONFIG_JBD2=y
7021160a165
7022> CONFIG_JBD2=y
7023186d190
7024< CONFIG_LOG_BUF_SHIFT=15
7025187a192
7026> CONFIG_LOG_BUF_SHIFT=15
7027189d193
7028< CONFIG_MEMORY_HOTPLUG_SPARSE=y
7029190a195
7030> CONFIG_MEMORY_HOTPLUG_SPARSE=y
7031200d204
7032< # CONFIG_NET_ETHERNET is not set
7033202a207,208
7034> # CONFIG_NET_ETHERNET is not set
7035> CONFIG_NLS=y
7036205d210
7037< CONFIG_NLS=y
7038208d212
7039< CONFIG_OF_DEVICE=y
7040209a214
7041> CONFIG_OF_DEVICE=y
7042215d219
7043< # CONFIG_PCI is not set
7044217d220
7045< CONFIG_PHYS_ADDR_T_64BIT=y
7046218a222
7047> CONFIG_PHYS_ADDR_T_64BIT=y
7048220d223
7049< # CONFIG_POWER4_ONLY is not set
7050221a225,226
7051> # CONFIG_POWER4_ONLY is not set
7052> CONFIG_PPC=y
7053224a230
7054> CONFIG_PPC_CELL=y
7055228d233
7056< CONFIG_PPC_CELL=y
7057242d246
7058< # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
7059243a248
7060> # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
7061250d254
7062< CONFIG_PPC_STD_MMU_64=y
7063251a256
7064> CONFIG_PPC_STD_MMU_64=y
7065253d257
7066< CONFIG_PPC=y
7067276a281
7068> CONFIG_SCSI=y
7069279d283
7070< CONFIG_SCSI=y
7071282a287
7072> CONFIG_SPARSEMEM=y
7073285d289
7074< CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
7075287c291
7076< CONFIG_SPARSEMEM=y
7077---
7078> CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
7079298a303
7080> CONFIG_USB=y
7081301d305
7082< CONFIG_USB_EHCI_HCD_PPC_OF=y
7083302a307
7084> CONFIG_USB_EHCI_HCD_PPC_OF=y
7085307d311
7086< # CONFIG_USB_OHCI_HCD_PPC_OF is not set
7087308a313,314
7088> # CONFIG_USB_OHCI_HCD_PPC_OF is not set
7089> CONFIG_USB_STORAGE=y
7090317d322
7091< CONFIG_USB_STORAGE=y
7092319,320d323
7093< CONFIG_USB=y
7094< CONFIG_USE_GENERIC_SMP_HELPERS=y
7095321a325
7096> CONFIG_USE_GENERIC_SMP_HELPERS=y
7097328a333
7098> CONFIG_VT=y
7099331d335
7100< CONFIG_VT=y
7101diff -r WNDR4300v2-basecompare/target/linux/pxa/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/pxa/config-default
71027a8
7103> CONFIG_ARCH_GUMSTIX=y
710411d11
7105< CONFIG_ARCH_GUMSTIX=y
710616d15
7107< # CONFIG_ARCH_PXA_IDP is not set
710818c17
7109< # CONFIG_ARM_THUMB is not set
7110---
7111> # CONFIG_ARCH_PXA_IDP is not set
711219a19
7113> # CONFIG_ARM_THUMB is not set
711422a23
7115> # CONFIG_ATA_NONSTANDARD is not set
711623a25
7117> CONFIG_BASE_SMALL=0
711827a30
7119> CONFIG_BLK_DEV_IDE=m
712031d33
7121< CONFIG_BLK_DEV_IDE=m
712239d40
7123< CONFIG_CPU_32v5=y
712440a42
7125> CONFIG_CPU_32v5=y
712643d44
7127< CONFIG_CPU_CP15_MMU=y
712844a46
7129> CONFIG_CPU_CP15_MMU=y
713045a48
7131> # CONFIG_CPU_FREQ is not set
713247a51
7133> # CONFIG_DEBUG_BUGVERBOSE is not set
713453a58
7135> CONFIG_FB=y
713656a62
7137> CONFIG_FB_PXA=y
713862d67
7139< CONFIG_FB_PXA=y
714064d68
7141< CONFIG_FB=y
714265a70
7143> CONFIG_FONTS=y
714476d80
7145< CONFIG_FONTS=y
714679d82
7147< CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
714880a84
7149> CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
715089d92
7151< # CONFIG_HFS_FS is not set
715290a94
7153> # CONFIG_HFS_FS is not set
715493a98
7155> CONFIG_I2C=m
715696d100
7157< CONFIG_I2C=m
715898a103
7159> CONFIG_IDE=m
7160101d105
7161< CONFIG_IDE=m
7162105d108
7163< CONFIG_INOTIFY_USER=y
7164106a110,111
7165> CONFIG_INOTIFY_USER=y
7166> CONFIG_INPUT=y
7167113d117
7168< CONFIG_INPUT=y
7169126a131
7170> CONFIG_LOGO=y
7171130d134
7172< CONFIG_LOGO=y
7173135a140
7174> CONFIG_MMC=y
7175138d142
7176< CONFIG_MMC=y
7177155a160
7178> # CONFIG_NVRAM is not set
7179161d165
7180< CONFIG_PCMCIA_LOAD_CIS=y
7181162a167
7182> CONFIG_PCMCIA_LOAD_CIS=y
7183163a169
7184> CONFIG_PM=y
7185167d172
7186< CONFIG_PM=y
7187169d173
7188< # CONFIG_PROC_GPIO_DEBUG is not set
7189170a175
7190> # CONFIG_PROC_GPIO_DEBUG is not set
7191177d181
7192< CONFIG_SERIAL_PXA_CONSOLE=y
7193179c183
7194< CONFIG_SERIO_LIBPS2=m
7195---
7196> CONFIG_SERIAL_PXA_CONSOLE=y
7197180a185
7198> CONFIG_SERIO_LIBPS2=m
7199183d187
7200< CONFIG_SMC911X_GUMSTIX=m
7201185c189
7202< CONFIG_SMC91X_GUMSTIX=m
7203---
7204> CONFIG_SMC911X_GUMSTIX=m
7205186a191
7206> CONFIG_SMC91X_GUMSTIX=m
7207189a195
7208> CONFIG_SND_PXA2XX_SOC=m
7209192c198
7210< CONFIG_SND_PXA2XX_SOC=m
7211---
7212> CONFIG_SND_SOC=m
7213195d200
7214< CONFIG_SND_SOC=m
7215205a211
7216> # CONFIG_USBPCWATCHDOG is not set
7217213d218
7218< # CONFIG_USBPCWATCHDOG is not set
7219231a237
7220> CONFIG_VT=y
7221234d239
7222< CONFIG_VT=y
7223Seulement dans WNDR4300v2-basecompare/target/linux/pxa: profiles
7224diff -r WNDR4300v2-basecompare/target/linux/pxcab/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/pxcab/config-2.6.30
722523a24
7226> CONFIG_BASE_SMALL=0
722726a28
7228> CONFIG_BLK_DEV_RAM=y
722929d30
7230< CONFIG_BLK_DEV_RAM=y
723131d31
7232< # CONFIG_BLK_DEV_SR_VENDOR is not set
723332a33
7234> # CONFIG_BLK_DEV_SR_VENDOR is not set
723538d38
7236< # CONFIG_BOOT_PRINTK_DELAY is not set
723739a40
7238> # CONFIG_BOOT_PRINTK_DELAY is not set
723942a44
7240> CONFIG_CBE_CPUFREQ=y
724145d46
7242< CONFIG_CBE_CPUFREQ=y
724350a52
7244> CONFIG_COMPAT=y
724553d54
7246< CONFIG_COMPAT=y
724754a56
7248> CONFIG_CPU_FREQ=y
724966d67
7250< # CONFIG_CPU_FREQ_STAT_DETAILS is not set
725167a69
7252> # CONFIG_CPU_FREQ_STAT_DETAILS is not set
725369c71
7254< CONFIG_CPU_FREQ=y
7255---
7256> # CONFIG_CRASH_DUMP is not set
725782d83
7258< # CONFIG_DEBUG_LOCK_ALLOC is not set
725983a85
7260> # CONFIG_DEBUG_LOCK_ALLOC is not set
7261114d115
7262< # CONFIG_EXT4_FS_XATTR is not set
7263115a117
7264> # CONFIG_EXT4_FS_XATTR is not set
7265122a125
7266> # CONFIG_FONTS is not set
7267125d127
7268< # CONFIG_FONTS is not set
7269126a129
7270> CONFIG_FRAMEBUFFER_CONSOLE=y
7271129d131
7272< CONFIG_FRAMEBUFFER_CONSOLE=y
7273134d135
7274< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
7275135a137
7276> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
7277170a173
7278> CONFIG_HID=y
7279180d182
7280< CONFIG_HID=y
7281182a185
7282> # CONFIG_HVCS is not set
7283187d189
7284< # CONFIG_HVCS is not set
7285191d192
7286< # CONFIG_HZ_100 is not set
7287192a194
7288> # CONFIG_HZ_100 is not set
7289194c196
7290< # CONFIG_IBM_BSR is not set
7291---
7292> # CONFIG_I2C is not set
7293195a198,199
7294> CONFIG_IBMVIO=y
7295> # CONFIG_IBM_BSR is not set
7296200d203
7297< CONFIG_IBMVIO=y
7298204d206
7299< CONFIG_INOTIFY_USER=y
7300205a208,209
7301> CONFIG_INOTIFY_USER=y
7302> CONFIG_INPUT=y
7303207a212
7304> CONFIG_INPUT_MOUSEDEV=y
7305211,212d215
7306< CONFIG_INPUT_MOUSEDEV=y
7307< CONFIG_INPUT=y
7308216d218
7309< # CONFIG_IP_ADVANCED_ROUTER is not set
7310217a220
7311> # CONFIG_IP_ADVANCED_ROUTER is not set
7312218a222
7313> # CONFIG_IRQSTACKS is not set
7314221d224
7315< # CONFIG_IRQSTACKS is not set
7316225d227
7317< CONFIG_JBD2=y
7318226a229
7319> CONFIG_JBD2=y
7320248d250
7321< # CONFIG_KALLSYMS_ALL is not set
7322249a252
7323> # CONFIG_KALLSYMS_ALL is not set
7324256d258
7325< CONFIG_LOG_BUF_SHIFT=15
7326257a260
7327> CONFIG_LOG_BUF_SHIFT=15
7328260d262
7329< CONFIG_MEMORY_HOTPLUG_SPARSE=y
7330261a264
7331> CONFIG_MEMORY_HOTPLUG_SPARSE=y
7332267d269
7333< # CONFIG_MPIC_WEIRD is not set
7334268a271
7335> # CONFIG_MPIC_WEIRD is not set
7336274d276
7337< # CONFIG_NET_ETHERNET is not set
7338276a279,280
7339> # CONFIG_NET_ETHERNET is not set
7340> CONFIG_NLS=y
7341279d282
7342< CONFIG_NLS=y
7343284d286
7344< CONFIG_OF_DEVICE=y
7345285a288
7346> CONFIG_OF_DEVICE=y
7347289a293,294
7348> CONFIG_PCI=y
7349> # CONFIG_PCIEPORTBUS is not set
7350292c297
7351< # CONFIG_PCIEPORTBUS is not set
7352---
7353> CONFIG_PCI_SYSCALL=y
7354296d300
7355< CONFIG_PHYS_ADDR_T_64BIT=y
7356297a302
7357> CONFIG_PHYS_ADDR_T_64BIT=y
7358299d303
7359< # CONFIG_POWER4_ONLY is not set
7360300a305,307
7361> # CONFIG_POWER4_ONLY is not set
7362> CONFIG_PPC=y
7363> CONFIG_PPC64=y
7364305d311
7365< CONFIG_PPC64=y
7366308c314
7367< CONFIG_PPC_CELL_COMMON=y
7368---
7369> CONFIG_PPC_CELL=y
7370309a316
7371> CONFIG_PPC_CELL_COMMON=y
7372312d318
7373< CONFIG_PPC_CELL=y
7374313a320
7375> CONFIG_PPC_DCR=y
7376316d322
7377< CONFIG_PPC_DCR=y
7378330a337
7379> CONFIG_PPC_OF=y
7380333d339
7381< CONFIG_PPC_OF=y
7382342d347
7383< CONFIG_PPC_STD_MMU_64=y
7384343a349
7385> CONFIG_PPC_STD_MMU_64=y
7386345,346d350
7387< CONFIG_PPC=y
7388< CONFIG_PPP_ASYNC=m
7389348a353
7390> CONFIG_PPP_ASYNC=m
7391362a368
7392> # CONFIG_SCHEDSTATS is not set
7393367c373
7394< # CONFIG_SCHEDSTATS is not set
7395---
7396> CONFIG_SCSI=y
7397370d375
7398< CONFIG_SCSI=y
7399380a386
7400> CONFIG_SPARSEMEM=y
7401383d388
7402< CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
7403385c390
7404< CONFIG_SPARSEMEM=y
7405---
7406> CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
7407401a407
7408> CONFIG_USB=y
7409403d408
7410< CONFIG_USB_EHCI_HCD_PPC_OF=y
7411404a410
7412> CONFIG_USB_EHCI_HCD_PPC_OF=y
7413409d414
7414< # CONFIG_USB_OHCI_HCD_PPC_OF is not set
7415410a416,417
7416> # CONFIG_USB_OHCI_HCD_PPC_OF is not set
7417> CONFIG_USB_STORAGE=y
7418419d425
7419< CONFIG_USB_STORAGE=y
7420422,423d427
7421< CONFIG_USB=y
7422< CONFIG_USE_GENERIC_SMP_HELPERS=y
7423424a429
7424> CONFIG_USE_GENERIC_SMP_HELPERS=y
7425431a437
7426> CONFIG_VT=y
7427434d439
7428< CONFIG_VT=y
7429diff -r WNDR4300v2-basecompare/target/linux/pxcab/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/pxcab/config-2.6.31
743023a24
7431> CONFIG_BASE_SMALL=0
743226a28
7433> CONFIG_BLK_DEV_RAM=y
743429d30
7435< CONFIG_BLK_DEV_RAM=y
743631d31
7437< # CONFIG_BLK_DEV_SR_VENDOR is not set
743832a33
7439> # CONFIG_BLK_DEV_SR_VENDOR is not set
744040a42
7441> CONFIG_CBE_CPUFREQ=y
744243d44
7443< CONFIG_CBE_CPUFREQ=y
744449a51
7445> CONFIG_COMPAT=y
744652d53
7447< CONFIG_COMPAT=y
744854a56
7449> CONFIG_CPU_FREQ=y
745066d67
7451< # CONFIG_CPU_FREQ_STAT_DETAILS is not set
745267a69
7453> # CONFIG_CPU_FREQ_STAT_DETAILS is not set
745469c71
7455< CONFIG_CPU_FREQ=y
7456---
7457> # CONFIG_CRASH_DUMP is not set
745882d83
7459< # CONFIG_DEBUG_LOCK_ALLOC is not set
746083a85
7461> # CONFIG_DEBUG_LOCK_ALLOC is not set
7462115d116
7463< # CONFIG_EXT4_FS_XATTR is not set
7464116a118
7465> # CONFIG_EXT4_FS_XATTR is not set
7466123a126
7467> # CONFIG_FONTS is not set
7468126d128
7469< # CONFIG_FONTS is not set
7470127a130
7471> CONFIG_FRAMEBUFFER_CONSOLE=y
7472130d132
7473< CONFIG_FRAMEBUFFER_CONSOLE=y
7474136d137
7475< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
7476137a139
7477> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
7478170d171
7479< CONFIG_HAVE_MLOCKED_PAGE_BIT=y
7480171a173
7481> CONFIG_HAVE_MLOCKED_PAGE_BIT=y
7482175a178
7483> CONFIG_HID=y
7484193d195
7485< CONFIG_HID=y
7486196a199
7487> # CONFIG_HVCS is not set
7488201d203
7489< # CONFIG_HVCS is not set
7490205d206
7491< # CONFIG_HZ_100 is not set
7492206a208
7493> # CONFIG_HZ_100 is not set
7494208c210
7495< # CONFIG_IBM_BSR is not set
7496---
7497> # CONFIG_I2C is not set
7498209a212,213
7499> CONFIG_IBMVIO=y
7500> # CONFIG_IBM_BSR is not set
7501214d217
7502< CONFIG_IBMVIO=y
7503218d220
7504< CONFIG_INOTIFY_USER=y
7505219a222,223
7506> CONFIG_INOTIFY_USER=y
7507> CONFIG_INPUT=y
7508221a226
7509> CONFIG_INPUT_MOUSEDEV=y
7510225,226d229
7511< CONFIG_INPUT_MOUSEDEV=y
7512< CONFIG_INPUT=y
7513230d232
7514< # CONFIG_IP_ADVANCED_ROUTER is not set
7515231a234
7516> # CONFIG_IP_ADVANCED_ROUTER is not set
7517232a236
7518> # CONFIG_IRQSTACKS is not set
7519235d238
7520< # CONFIG_IRQSTACKS is not set
7521239d241
7522< CONFIG_JBD2=y
7523240a243
7524> CONFIG_JBD2=y
7525262d264
7526< # CONFIG_KALLSYMS_ALL is not set
7527263a266
7528> # CONFIG_KALLSYMS_ALL is not set
7529271d273
7530< CONFIG_LOG_BUF_SHIFT=15
7531272a275
7532> CONFIG_LOG_BUF_SHIFT=15
7533276d278
7534< CONFIG_MEMORY_HOTPLUG_SPARSE=y
7535277a280
7536> CONFIG_MEMORY_HOTPLUG_SPARSE=y
7537283d285
7538< # CONFIG_MPIC_WEIRD is not set
7539284a287
7540> # CONFIG_MPIC_WEIRD is not set
7541290d292
7542< # CONFIG_NET_ETHERNET is not set
7543292a295,296
7544> # CONFIG_NET_ETHERNET is not set
7545> CONFIG_NLS=y
7546295d298
7547< CONFIG_NLS=y
7548299a303
7549> CONFIG_OF=y
7550302d305
7551< CONFIG_OF=y
7552306a310,311
7553> CONFIG_PCI=y
7554> # CONFIG_PCIEPORTBUS is not set
7555309c314
7556< # CONFIG_PCIEPORTBUS is not set
7557---
7558> CONFIG_PCI_SYSCALL=y
7559314d318
7560< CONFIG_PHYS_ADDR_T_64BIT=y
7561315a320
7562> CONFIG_PHYS_ADDR_T_64BIT=y
7563317d321
7564< # CONFIG_POWER4_ONLY is not set
7565318a323,325
7566> # CONFIG_POWER4_ONLY is not set
7567> CONFIG_PPC=y
7568> CONFIG_PPC64=y
7569323d329
7570< CONFIG_PPC64=y
7571325d330
7572< CONFIG_PPC_BOOK3S_64=y
7573327c332,333
7574< CONFIG_PPC_CELL_COMMON=y
7575---
7576> CONFIG_PPC_BOOK3S_64=y
7577> CONFIG_PPC_CELL=y
7578328a335
7579> CONFIG_PPC_CELL_COMMON=y
7580331d337
7581< CONFIG_PPC_CELL=y
7582332a339
7583> CONFIG_PPC_DCR=y
7584335d341
7585< CONFIG_PPC_DCR=y
7586351a358
7587> CONFIG_PPC_OF=y
7588354d360
7589< CONFIG_PPC_OF=y
7590363d368
7591< CONFIG_PPC_STD_MMU_64=y
7592364a370
7593> CONFIG_PPC_STD_MMU_64=y
7594367,368d372
7595< CONFIG_PPC=y
7596< CONFIG_PPP_ASYNC=m
7597370a375
7598> CONFIG_PPP_ASYNC=m
7599382d386
7600< # CONFIG_RT_GROUP_SCHED is not set
7601383a388
7602> # CONFIG_RT_GROUP_SCHED is not set
7603386a392
7604> # CONFIG_SCHEDSTATS is not set
7605391c397
7606< # CONFIG_SCHEDSTATS is not set
7607---
7608> CONFIG_SCSI=y
7609394d399
7610< CONFIG_SCSI=y
7611404a410
7612> CONFIG_SPARSEMEM=y
7613407d412
7614< CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
7615409c414
7616< CONFIG_SPARSEMEM=y
7617---
7618> CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
7619426a432
7620> CONFIG_USB=y
7621428d433
7622< CONFIG_USB_EHCI_HCD_PPC_OF=y
7623429a435
7624> CONFIG_USB_EHCI_HCD_PPC_OF=y
7625434c440
7626< # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
7627---
7628> CONFIG_USB_OHCI_HCD=y
7629435a442
7630> # CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
7631437c444
7632< CONFIG_USB_OHCI_HCD=y
7633---
7634> CONFIG_USB_STORAGE=y
7635446d452
7636< CONFIG_USB_STORAGE=y
7637450,451d455
7638< CONFIG_USB=y
7639< CONFIG_USE_GENERIC_SMP_HELPERS=y
7640452a457
7641> CONFIG_USE_GENERIC_SMP_HELPERS=y
7642459a465
7643> CONFIG_VT=y
7644462d467
7645< CONFIG_VT=y
7646Seulement dans WNDR4300v2-basecompare/target/linux/pxcab: patches-2.6.30
7647diff -r WNDR4300v2-basecompare/target/linux/ramips/rt288x/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ramips/rt288x/config-2.6.30
76489a10
7649> CONFIG_BASE_SMALL=0
765016d16
7651< CONFIG_CEVT_R4K_LIB=y
765217a18
7653> CONFIG_CEVT_R4K_LIB=y
765425a27
7655> CONFIG_CPU_MIPS32=y
765628d29
7657< CONFIG_CPU_MIPS32=y
765850d50
7659< CONFIG_CSRC_R4K_LIB=y
766051a52
7661> CONFIG_CSRC_R4K_LIB=y
766258d58
7663< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
766459a60
7665> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
766677a79
7667> # CONFIG_I2C is not set
766890a93
7669> CONFIG_MIPS=y
7670101d103
7671< CONFIG_MIPS=y
7672104a107
7673> # CONFIG_NATSEMI is not set
7674108a112
7675> CONFIG_PCI=y
7676109a114
7677> # CONFIG_PCSPKR_PLATFORM is not set
7678147a153
7679> CONFIG_TICK_ONESHOT=y
7680diff -r WNDR4300v2-basecompare/target/linux/ramips/rt305x/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ramips/rt305x/config-2.6.30
76819a10
7682> CONFIG_BASE_SMALL=0
768316d16
7684< CONFIG_CEVT_R4K_LIB=y
768517a18
7686> CONFIG_CEVT_R4K_LIB=y
768725a27
7688> CONFIG_CPU_MIPS32=y
768928d29
7690< CONFIG_CPU_MIPS32=y
769150d50
7692< CONFIG_CSRC_R4K_LIB=y
769351a52
7694> CONFIG_CSRC_R4K_LIB=y
769557d57
7696< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
769758a59
7698> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
769975a77
7700> # CONFIG_I2C is not set
770188a91
7702> CONFIG_MIPS=y
7703100d102
7704< CONFIG_MIPS=y
7705106a109
7706> # CONFIG_PCSPKR_PLATFORM is not set
7707146a150
7708> CONFIG_TICK_ONESHOT=y
7709diff -r WNDR4300v2-basecompare/target/linux/rb532/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rb532/config-default
771010a11,14
7711> # CONFIG_ATA_NONSTANDARD is not set
7712> # CONFIG_ATA_PIIX is not set
7713> CONFIG_ATA_SFF=y
7714> CONFIG_BASE_SMALL=0
771519d22
7716< CONFIG_CEVT_R4K_LIB=y
771720a24
7718> CONFIG_CEVT_R4K_LIB=y
771927a32
7720> CONFIG_CPU_MIPS32=y
772130d34
7722< CONFIG_CPU_MIPS32=y
772352d55
7724< CONFIG_CSRC_R4K_LIB=y
772553a57
7726> CONFIG_CSRC_R4K_LIB=y
772762d65
7728< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
772963a67
7730> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
773183d86
7732< # CONFIG_HZ_100 is not set
773384a88
7734> # CONFIG_HZ_100 is not set
773585a90
7736> # CONFIG_I2C is not set
7737100a106
7738> CONFIG_MIPS=y
7739110d115
7740< CONFIG_MIPS=y
7741116a122
7742> CONFIG_MTD_NAND=y
7743119d124
7744< CONFIG_MTD_NAND=y
7745122a128
7746> # CONFIG_NATSEMI is not set
7747129a136
7748> CONFIG_PCI=y
7749138a146
7750> CONFIG_SCSI=y
7751142d149
7752< CONFIG_SCSI=y
7753165d171
7754< CONFIG_VIA_RHINE_MMIO=y
7755166a173
7756> CONFIG_VIA_RHINE_MMIO=y
7757diff -r WNDR4300v2-basecompare/target/linux/rb532/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rb532/Makefile
775811a12
7759> CUSTOMER:=openwrt
7760Seulement dans WNDR4300v2-basecompare/target/linux/rb532: profiles
7761Seulement dans WNDR4300v2-basecompare/target/linux/rdc: amit
7762Seulement dans WNDR4300v2-basecompare/target/linux/rdc: ar525w
7763Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/config: profile-ar525w
7764Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/config: profile-dir450
7765Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/config: profile-r8610
7766Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/config: profile-wl153
7767diff -r WNDR4300v2-basecompare/target/linux/rdc/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/config-2.6.28
776824a25
7769> CONFIG_BASE_SMALL=0
777026a28,29
7771> CONFIG_BLK_DEV_RAM=y
7772> CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
777329d31
7774< CONFIG_BLK_DEV_RAM=y
777534d35
7776< CONFIG_CMDLINE_BOOL=y
777735a37
7778> CONFIG_CMDLINE_BOOL=y
777939,40c41,43
7780< # CONFIG_CPU_SUP_AMD is not set
7781< # CONFIG_CPU_SUP_CENTAUR_32 is not set
7782---
7783> # CONFIG_CPU_FREQ is not set
7784> CONFIG_CPU_SUP_AMD=y
7785> CONFIG_CPU_SUP_CENTAUR_32=y
778642,44c45,47
7787< # CONFIG_CPU_SUP_INTEL is not set
7788< # CONFIG_CPU_SUP_TRANSMETA_32 is not set
7789< # CONFIG_CPU_SUP_UMC_32 is not set
7790---
7791> CONFIG_CPU_SUP_INTEL=y
7792> CONFIG_CPU_SUP_TRANSMETA_32=y
7793> CONFIG_CPU_SUP_UMC_32=y
779446a50
7795> # CONFIG_DEBUG_BUGVERBOSE is not set
779650c54,55
7797< # CONFIG_DMI is not set
7798---
7799> CONFIG_DMI=y
7800> CONFIG_DMIID=y
780152d56
7802< # CONFIG_EARLY_PRINTK_DBGP is not set
780353a58
7804> # CONFIG_EARLY_PRINTK_DBGP is not set
780561d65
7806< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
780762a67
7808> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
7809100a106
7810> CONFIG_HW_RANDOM=y
7811105,106d110
7812< CONFIG_HW_RANDOM=y
7813< # CONFIG_HZ_100 is not set
7814107a112
7815> # CONFIG_HZ_100 is not set
7816108a114
7817> # CONFIG_I2C is not set
7818112a119,120
7819> # CONFIG_IBM_ASM is not set
7820> CONFIG_ICPLUS_PHY=y
7821114a123
7822> # CONFIG_IOMMU_HELPER is not set
7823123,124d131
7824< # CONFIG_IOMMU_HELPER is not set
7825< CONFIG_ISA_DMA_API=y
7826125a133
7827> CONFIG_ISA_DMA_API=y
7828132a141
7829> CONFIG_KEXEC=y
7830133a143
7831> # CONFIG_KVM is not set
7832135,137c145
7833< # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
7834< # CONFIG_LEDS_TRIGGER_NETDEV is not set
7835< # CONFIG_LEDS_TRIGGER_TIMER is not set
7836---
7837> # CONFIG_LGUEST is not set
7838162d169
7839< # CONFIG_MPENTIUMIII is not set
7840163a171
7841> # CONFIG_MPENTIUMIII is not set
7842170a179
7843> CONFIG_MTD_PHYSMAP=y
7844174d182
7845< CONFIG_MTD_PHYSMAP=y
7846183a192
7847> # CONFIG_NATSEMI is not set
7848185a195
7849> CONFIG_NVRAM=y
7850192a203,204
7851> CONFIG_PCI=y
7852> # CONFIG_PCIEPORTBUS is not set
7853196d207
7854< # CONFIG_PCIEPORTBUS is not set
7855201a213,214
7856> # CONFIG_PCSPKR_PLATFORM is not set
7857> CONFIG_PHYLIB=y
7858204c217
7859< CONFIG_PROCESSOR_SELECT=y
7860---
7861> # CONFIG_PROCESSOR_SELECT is not set
7862206a220
7863> CONFIG_RDC321X_WDT=y
7864208d221
7865< # CONFIG_RDC321X_WDT is not set
7866224a238
7867> # CONFIG_SMP is not set
7868234a249,251
7869> # CONFIG_VIRTIO_BALLOON is not set
7870> # CONFIG_VIRTIO_PCI is not set
7871> CONFIG_VIRTUALIZATION=y
7872236d252
7873< CONFIG_VM_EVENT_COUNTERS=y
7874238a255
7875> CONFIG_VM_EVENT_COUNTERS=y
7876240a258
7877> CONFIG_X86=y
7878248d265
7879< # CONFIG_X86_CPUID is not set
7880249a267
7881> CONFIG_X86_CPUID=y
7882252d269
7883< # CONFIG_X86_GENERICARCH is not set
7884253a271
7885> # CONFIG_X86_GENERICARCH is not set
7886258c276
7887< # CONFIG_X86_MSR is not set
7888---
7889> CONFIG_X86_MSR=y
7890262c280
7891< # CONFIG_X86_PPRO_FENCE is not set
7892---
7893> CONFIG_X86_PPRO_FENCE=y
7894265c283
7895< # CONFIG_X86_RESERVE_LOW_64K is not set
7896---
7897> CONFIG_X86_RESERVE_LOW_64K=y
7898267c285
7899< # CONFIG_X86_VERBOSE_BOOTUP is not set
7900---
7901> CONFIG_X86_VERBOSE_BOOTUP=y
7902272d289
7903< CONFIG_X86=y
7904diff -r WNDR4300v2-basecompare/target/linux/rdc/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/config-2.6.30
790531c31
7906< # CONFIG_BLK_DEV_INITRD is not set
7907---
7908> CONFIG_BLK_DEV_RAM=y
790934d33
7910< CONFIG_BLK_DEV_RAM=y
791138a38
7912> CONFIG_CMDLINE="console=ttyS0,38400"
791340d39
7914< CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
791544a44
7916> # CONFIG_CPU_FREQ is not set
791752a53
7918> # CONFIG_DEBUG_BUGVERBOSE is not set
791954c55
7920< CONFIG_DECOMPRESS_LZMA=y
7921---
7922> CONFIG_DECOMPRESS_GZIP=y
792361c62,63
7924< # CONFIG_EARLY_PRINTK is not set
7925---
7926> CONFIG_EARLY_PRINTK=y
7927> # CONFIG_EARLY_PRINTK_DBGP is not set
792871d72
7929< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
793072a74
7931> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
7932100d101
7933< CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
7934101a103
7935> CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
7936110d111
7937< CONFIG_HAVE_KVM_IRQCHIP=y
7938111a113
7939> CONFIG_HAVE_KVM_IRQCHIP=y
7940125d126
7941< # CONFIG_HZ_100 is not set
7942126a128
7943> # CONFIG_HZ_100 is not set
7944127a130
7945> # CONFIG_I2C is not set
7946131a135,137
7947> CONFIG_INITRAMFS_SOURCE=""
7948> # CONFIG_IOMMU_API is not set
7949> # CONFIG_IOMMU_HELPER is not set
7950140,141d145
7951< # CONFIG_IOMMU_API is not set
7952< # CONFIG_IOMMU_HELPER is not set
7953143d146
7954< CONFIG_ISA_DMA_API=y
7955144a148
7956> CONFIG_ISA_DMA_API=y
7957156,158d159
7958< # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
7959< # CONFIG_LEDS_TRIGGER_NETDEV is not set
7960< # CONFIG_LEDS_TRIGGER_TIMER is not set
7961167c168
7962< CONFIG_MATH_EMULATION=y
7963---
7964> # CONFIG_MATH_EMULATION is not set
7965183d183
7966< # CONFIG_MPENTIUMIII is not set
7967184a185
7968> # CONFIG_MPENTIUMIII is not set
7969190d190
7970< CONFIG_MTD_PHYSMAP=y
7971192c192,197
7972< # CONFIG_MTD_RDC3210 is not set
7973---
7974> CONFIG_MTD_RDC3210=y
7975> CONFIG_MTD_RDC3210_ALLOW_JFFS2=y
7976> CONFIG_MTD_RDC3210_BUSWIDTH=2
7977> # CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set
7978> CONFIG_MTD_RDC3210_SIZE=0x400000
7979> # CONFIG_MTD_RDC3210_STATIC_MAP is not set
7980198a204
7981> # CONFIG_NATSEMI is not set
7982202a209
7983> CONFIG_NVRAM=y
7984209a217,218
7985> CONFIG_PCI=y
7986> # CONFIG_PCIEPORTBUS is not set
7987214d222
7988< # CONFIG_PCIEPORTBUS is not set
7989220a229
7990> # CONFIG_PCSPKR_PLATFORM is not set
7991226c235,237
7992< CONFIG_RDC321X_WDT=m
7993---
7994> CONFIG_RDC321X_WDT=y
7995> CONFIG_RD_GZIP=y
7996> # CONFIG_RD_LZMA is not set
7997242a254
7998> # CONFIG_SMP is not set
7999259c271
8000< CONFIG_X86_32_LAZY_GS=y
8001---
8002> CONFIG_X86=y
8003260a273
8004> CONFIG_X86_32_LAZY_GS=y
8005266,267d278
8006< # CONFIG_X86_CPU_DEBUG is not set
8007< # CONFIG_X86_CPUID is not set
8008268a280,281
8009> # CONFIG_X86_CPUID is not set
8010> # CONFIG_X86_CPU_DEBUG is not set
8011288c301
8012< # CONFIG_X86_VERBOSE_BOOTUP is not set
8013---
8014> CONFIG_X86_VERBOSE_BOOTUP=y
8015291d303
8016< CONFIG_X86=y
8017Seulement dans WNDR4300v2-basecompare/target/linux/rdc: dir-450
8018Seulement dans WNDR4300v2-basecompare/target/linux/rdc: files-2.6.30
8019diff -r WNDR4300v2-basecompare/target/linux/rdc/image/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/image/Makefile
80201,2c1,2
8021< #
8022< # Copyright (C) 2006-2009 OpenWrt.org
8023---
8024> # 
8025> # Copyright (C) 2006 OpenWrt.org
802624,27d23
8027< define Image/Prepare/squashfs
8028< 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
8029< endef
8030< 
803137,46d32
8032< define Image/Prepare/wl153/squashfs
8033< 	dd if=/dev/null of=$(KDIR)/root.tmp seek=1 bs=32k
8034< 	echo -n "0123456789abcdef0123" >> $(KDIR)/root.tmp
8035< 	cat $(KDIR)/bzImage $(KDIR)/root.squashfs >> $(KDIR)/root.tmp
8036< 	dd if=$(KDIR)/root.tmp of=$(KDIR)/root2.tmp bs=64k conv=sync
8037< 	dd if=$(KDIR)/root2.tmp of=$(KDIR)/root.squashfs bs=1 skip=$$$$(perl -we 'print((-s"$(KDIR)/bzImage")+0x8014)')
8038< 	$(RM) $(KDIR)/root.tmp $(KDIR)/root2.tmp
8039< 	$(call add_jffs2_mark,$(KDIR)/root.squashfs)
8040< endef
8041< 
804248,56c34,43
8043< 	echo -ne "\0\0" >> $(KDIR)/bzImage
8044< 	dd if=$(KDIR)/bzImage of=$(KDIR)/bzImage.tmp bs=4 conv=sync
8045< 	dd if=$(KDIR)/bzImage.tmp of=$(KDIR)/bzImage bs=1 count=$$$$(perl -we 'print((-s"$(KDIR)/bzImage.tmp")-2)')
8046< 	perl -we 'while(<>){$$$$i.=$$$$_}print pack"v",-(unpack"%v*",$$$$i)' < $(KDIR)/bzImage.tmp >> $(KDIR)/bzImage
8047< 	$(RM) $(KDIR)/bzImage.tmp
8048< 	$(call Image/Prepare/wl153/$(1))
8049< 	perl -we 'print "CSYS",pack("V",-s"$(KDIR)/bzImage"),pack("V",-s"$(KDIR)/root.$(1)"),"WRRM",pack("V",-s"$(KDIR)/bzImage")' > $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
8050< 	cat $(KDIR)/bzImage $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
8051< 	if [ `perl -we 'print -s"$(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img"'` -gt $$$$((0xffff0000-0xffe08000)) ]; then mv $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img.too_big; echo "#ERR image too big"; fi 
8052---
8053> 	ls -l $(KDIR)/bzImage | sed -r 's/^[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).+$$$$/\1/' | xargs printf '%.8x' > $(KDIR)/bzSize
8054> 	gzip -9c $(KDIR)/root.$(1) > $(KDIR)/root.$(1).gz
8055> 	ls -l $(KDIR)/root.$(1).gz | sed -r 's/^[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).+$$$$/\1/' | xargs printf '%.8x' > $(KDIR)/rdSize
8056> 	echo -ne "\x$$$$(cut -c 7,8 < $(KDIR)/bzSize)\x$$$$(cut -c 5,6 < $(KDIR)/bzSize)\x$$$$(cut -c 3,4 < $(KDIR)/bzSize)\x$$$$(cut -c 1,2 < $(KDIR)/bzSize)" > $(KDIR)/bzSize.tmp
8057> 	echo -n 'CSYS' > $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
8058> 	cat $(KDIR)/bzSize.tmp >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
8059> 	echo -ne "\x$$$$(cut -c 7,8 < $(KDIR)/rdSize)\x$$$$(cut -c 5,6 < $(KDIR)/rdSize)\x$$$$(cut -c 3,4 < $(KDIR)/rdSize)\x$$$$(cut -c 1,2 < $(KDIR)/rdSize)WRRM" >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
8060> 	cat $(KDIR)/bzSize.tmp $(KDIR)/bzImage $(KDIR)/root.$(1).gz >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
8061> 	$(RM) $(KDIR)/bzSize.tmp $(KDIR)/bzSize $(KDIR)/rdSize
8062> 	if [ `ls -l $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img | sed -r 's/^[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).+$$$$/\1/'` -gt $$$$((0xffff0000-0xffe08000)) ]; then mv $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img.too_big; echo "#ERR image too big"; fi 
806367d53
8064< 	$(call Image/Prepare/$(1))
806578,86d63
8066< define Image/Prepare/amit/squashfs
8067< 	echo -n "0123456789abcdef" > $(KDIR)/root.tmp
8068< 	cat $(KDIR)/root.squashfs >> $(KDIR)/root.tmp
8069< 	dd if=$(KDIR)/root.tmp of=$(KDIR)/root2.tmp bs=64k conv=sync
8070< 	dd if=$(KDIR)/root2.tmp of=$(KDIR)/root.squashfs bs=1 skip=16
8071< 	$(RM) $(KDIR)/root.tmp $(KDIR)/root2.tmp
8072< 	$(call add_jffs2_mark,$(KDIR)/root.squashfs)
8073< endef
8074< 
807588d64
8076< 	$(call Image/Prepare/amit/$(1))
8077101c77
8078< 	$(call Image/Build/$(SUBTARGET),$(1),$(SUBTARGET),$(patsubst jffs2-%k,%,$(1)))
8079---
8080> 	$(call Image/Build/$(PROFILE),$(1),$(PROFILE),$(patsubst jffs2-%k,%,$(1)))
8081diff -r WNDR4300v2-basecompare/target/linux/rdc/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/Makefile
808212c12
8083< FEATURES:=squashfs jffs2 pci usb pcmcia
8084---
8085> FEATURES:=squashfs jffs2 pci usb
808614d13
8087< SUBTARGETS:=amit ar525w r8610 dir-450
808816c15
8089< LINUX_VERSION:=2.6.30.9
8090---
8091> LINUX_VERSION:=2.6.28.10
809220c19
8093< DEFAULT_PACKAGES += hostapd-mini kmod-rdc321x-wdt kmod-r6040
8094---
8095> DEFAULT_PACKAGES += hostapd-mini
809628,31d26
8097< 
8098< $(eval $(call RequireCommand,lzma, \
8099<         Please install lzma-4.4x. \
8100< ))
8101diff -r WNDR4300v2-basecompare/target/linux/rdc/patches-2.6.28/002-platform_support.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/patches-2.6.28/002-platform_support.patch
81023,4c3,4
8103< --- linux-2.6.28.10.orig/arch/x86/mach-rdc321x/gpio.c	2009-11-03 21:01:29.800401126 -0800
8104< +++ linux-2.6.28.10/arch/x86/mach-rdc321x/gpio.c	2009-11-03 21:01:32.164401226 -0800
8105---
8106> --- linux-2.6.28.10.orig/arch/x86/mach-rdc321x/gpio.c	2009-05-02 11:54:43.000000000 -0700
8107> +++ linux-2.6.28.10/arch/x86/mach-rdc321x/gpio.c	2009-10-30 22:24:23.779705091 -0700
810842,43c42,43
8109< --- linux-2.6.28.10.orig/arch/x86/mach-rdc321x/platform.c	2009-11-03 21:01:29.836402559 -0800
8110< +++ linux-2.6.28.10/arch/x86/mach-rdc321x/platform.c	2009-11-03 21:13:27.212398945 -0800
8111---
8112> --- linux-2.6.28.10.orig/arch/x86/mach-rdc321x/platform.c	2009-05-02 11:54:43.000000000 -0700
8113> +++ linux-2.6.28.10/arch/x86/mach-rdc321x/platform.c	2009-10-30 22:37:01.595670310 -0700
8114116c116
8115< @@ -54,16 +102,189 @@
8116---
8117> @@ -54,16 +102,163 @@
8118177c177
8119< +	u32 the_header[8];
8120---
8121> +	u32 the_header[4];
8122201,208d200
8123< +	rdc_map_info.virt = ioremap_nocache(rdc_map_info.phys + 0x8000, 0x10);
8124< +	if (rdc_map_info.virt == NULL)
8125< +		panic("Could not ioremap to read device magic!");
8126< +	the_header[4] = ((u32 *)rdc_map_info.virt)[0];
8127< +	the_header[5] = ((u32 *)rdc_map_info.virt)[1];
8128< +	the_header[6] = ((u32 *)rdc_map_info.virt)[2];
8129< +	the_header[7] = ((u32 *)rdc_map_info.virt)[3];
8130< +	iounmap(rdc_map_info.virt);
8131211,230c203,204
8132< +	} else if (!memcmp(the_header + 4, "CSYS", 4)) {	/* Sitecom */
8133< +		rdc_flash_parts[0].name = "system";
8134< +		rdc_flash_parts[0].offset = 0;
8135< +		rdc_flash_parts[0].size = rdc_map_info.size - 0x10000;
8136< +		rdc_flash_parts[1].name = "config";
8137< +		rdc_flash_parts[1].offset = 0;
8138< +		rdc_flash_parts[1].size = 0x8000;
8139< +		rdc_flash_parts[2].name = "magic";
8140< +		rdc_flash_parts[2].offset = 0x8000;
8141< +		rdc_flash_parts[2].size = 0x14;
8142< +		rdc_flash_parts[3].name = "kernel";
8143< +		rdc_flash_parts[3].offset = 0x8014;
8144< +		rdc_flash_parts[3].size = the_header[5];
8145< +		rdc_flash_parts[4].name = "rootfs";
8146< +		rdc_flash_parts[4].offset = 0x8014 + the_header[5];
8147< +		rdc_flash_parts[4].size = rdc_flash_parts[0].size - rdc_flash_parts[4].offset;
8148< +		rdc_flash_parts[5].name = "bootloader";
8149< +		rdc_flash_parts[5].offset = rdc_flash_parts[0].size;
8150< +		rdc_flash_parts[5].size = 0x10000;
8151< +		rdc_flash_data.nr_parts = 6;
8152---
8153> +	} else if (!memcmp(the_header, "CSYS", 4)) {	/* Sitecom */
8154> +		/* TODO */
8155310,311c284,285
8156< --- linux-2.6.28.10.orig/arch/x86/Makefile	2009-11-03 21:01:29.756400281 -0800
8157< +++ linux-2.6.28.10/arch/x86/Makefile	2009-11-03 21:01:32.164401226 -0800
8158---
8159> --- linux-2.6.28.10.orig/arch/x86/Makefile	2009-05-02 11:54:43.000000000 -0700
8160> +++ linux-2.6.28.10/arch/x86/Makefile	2009-10-30 22:04:55.444672426 -0700
8161325,326c299,300
8162< --- linux-2.6.28.10.orig/arch/x86/include/asm/mach-rdc321x/gpio.h	2009-11-03 21:01:29.784401606 -0800
8163< +++ linux-2.6.28.10/arch/x86/include/asm/mach-rdc321x/gpio.h	2009-11-03 21:01:32.164401226 -0800
8164---
8165> --- linux-2.6.28.10.orig/arch/x86/include/asm/mach-rdc321x/gpio.h	2009-10-30 22:31:04.680702348 -0700
8166> +++ linux-2.6.28.10/arch/x86/include/asm/mach-rdc321x/gpio.h	2009-10-30 22:34:24.024670851 -0700
8167Seulement dans WNDR4300v2-basecompare/target/linux/rdc/patches-2.6.30: 002-platform_support.patch
8168Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/patches-2.6.30: 003-rootfstype.patch
8169diff -r WNDR4300v2-basecompare/target/linux/rdc/patches-2.6.30/004-yenta_mystery.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/patches-2.6.30/004-yenta_mystery.patch
81707c7
8171< +#ifdef CONFIG_X86_RDC321X
8172---
8173> +#ifdef CONFIG_X86_RDC
8174diff -r WNDR4300v2-basecompare/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/patches-2.6.30/005-fix_amit_breakage.patch
817518,19c18,19
8176< +#ifdef CONFIG_X86_RDC321X
8177< +#include <asm/rdc321x_defs.h>
8178---
8179> +#ifdef CONFIG_X86_RDC
8180> +#include <asm/mach-rdc/rdc321x_defs.h>
818128c28
8182< +#ifdef CONFIG_X86_RDC321X
8183---
8184> +#ifdef CONFIG_X86_RDC
8185Seulement dans WNDR4300v2-basecompare/target/linux/rdc/patches-2.6.30: 010-rdc_cpu_ident.patch
8186Seulement dans WNDR4300v2-basecompare/target/linux/rdc/patches-2.6.30: 011-use_host_lzma.patch
8187Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/profiles: AMIT.mk
8188Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/profiles: AR525W.mk
8189Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/profiles: DIR-450.mk
8190Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/profiles: G-570S.mk
8191Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/profiles: R8610.mk
8192Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/rdc/profiles: WL-153.mk
8193Seulement dans WNDR4300v2-basecompare/target/linux/rdc: r8610
8194diff -r WNDR4300v2-basecompare/target/linux/s3c24xx/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/s3c24xx/config-2.6.30
81953a4
8196> CONFIG_AR6000_WLAN=y
81976d6
8198< CONFIG_AR6000_WLAN=y
819920d19
8200< CONFIG_ARM_THUMB=y
820121a21
8202> CONFIG_ARM_THUMB=y
820326a27
8204> CONFIG_BASE_SMALL=0
820529a31
8206> CONFIG_BLK_DEV_RAM=y
820732d33
8208< CONFIG_BLK_DEV_RAM=y
820939d39
8210< CONFIG_CPU_32v4T=y
821140a41
8212> CONFIG_CPU_32v4T=y
821346d46
8214< CONFIG_CPU_CP15_MMU=y
821547a48
8216> CONFIG_CPU_CP15_MMU=y
821750d50
8218< CONFIG_CPU_IDLE_GOV_LADDER=y
821952c52
8220< CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
8221---
8222> CONFIG_CPU_IDLE_GOV_LADDER=y
822353a54
8224> CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
822578a80
8226> CONFIG_FB=y
822782d83
8228< CONFIG_FB=y
822984a86
8230> CONFIG_FONTS=y
823195d96
8232< CONFIG_FONTS=y
823397d97
8234< # CONFIG_FPE_NWFPE_XP is not set
823598a99,100
8236> # CONFIG_FPE_NWFPE_XP is not set
8237> CONFIG_FRAMEBUFFER_CONSOLE=y
8238101d102
8239< CONFIG_FRAMEBUFFER_CONSOLE=y
8240109d109
8241< CONFIG_GPIO_DEVICE=y
8242110a111
8243> CONFIG_GPIO_DEVICE=y
8244125d125
8245< CONFIG_HAVE_MLOCKED_PAGE_BIT=y
8246126a127
8247> CONFIG_HAVE_MLOCKED_PAGE_BIT=y
8248129a131
8249> CONFIG_HID=y
8250151d152
8251< CONFIG_HID=y
8252154a156
8253> CONFIG_I2C=y
8254158d159
8255< CONFIG_I2C=y
8256162d162
8257< CONFIG_INOTIFY_USER=y
8258163a164,165
8259> CONFIG_INOTIFY_USER=y
8260> CONFIG_INPUT=y
8261167a170
8262> CONFIG_INPUT_MOUSEDEV=y
8263171d173
8264< CONFIG_INPUT_MOUSEDEV=y
8265174d175
8266< CONFIG_INPUT=y
8267175a177
8268> CONFIG_IP_PNP=y
8269179d180
8270< CONFIG_IP_PNP=y
8271206c207
8272< CONFIG_LOG_BUF_SHIFT=18
8273---
8274> CONFIG_LOGO=y
8275211c212
8276< CONFIG_LOGO=y
8277---
8278> CONFIG_LOG_BUF_SHIFT=18
8279217d217
8280< CONFIG_MACH_NEO1973_GTA02=y
8281218a219
8282> CONFIG_MACH_NEO1973_GTA02=y
8283230a232
8284> CONFIG_MFD_GLAMO=y
8285234d235
8286< CONFIG_MFD_GLAMO=y
8287237a239
8288> CONFIG_MMC=y
8289240d241
8290< CONFIG_MMC=y
8291246a248
8292> CONFIG_MTD_NAND=y
8293247a250
8294> CONFIG_MTD_NAND_S3C2410=y
8295251d253
8296< CONFIG_MTD_NAND_S3C2410=y
8297253d254
8298< CONFIG_MTD_NAND=y
8299257d257
8300< # CONFIG_NET_CLS_ACT is not set
8301258a259,260
8302> # CONFIG_NETWORK_FILESYSTEMS is not set
8303> # CONFIG_NET_CLS_ACT is not set
8304261d262
8305< # CONFIG_NETWORK_FILESYSTEMS is not set
8306270d270
8307< # CONFIG_PCI is not set
8308273d272
8309< CONFIG_PLAT_S3C24XX=y
8310274a274,275
8311> CONFIG_PLAT_S3C24XX=y
8312> CONFIG_PM=y
8313277,278d277
8314< CONFIG_PM=y
8315< # CONFIG_POWER_SUPPLY_DEBUG is not set
8316279a279
8317> # CONFIG_POWER_SUPPLY_DEBUG is not set
8318283a284
8319> CONFIG_REGULATOR=y
8320286d286
8321< CONFIG_REGULATOR=y
8322292d291
8323< # CONFIG_S3C2410_DMA_DEBUG is not set
8324293a293
8325> # CONFIG_S3C2410_DMA_DEBUG is not set
8326294a295
8327> CONFIG_S3C2410_PM=y
8328297d297
8329< CONFIG_S3C2410_PM=y
8330317a318
8331> CONFIG_SERIAL_SAMSUNG=y
8332320c321
8333< CONFIG_SERIAL_SAMSUNG=y
8334---
8335> CONFIG_SERIO=y
8336323d323
8337< CONFIG_SERIO=y
8338324a325
8339> CONFIG_SND=m
8340328d328
8341< CONFIG_SND=m
8342329a330
8343> CONFIG_SND_S3C24XX_SOC=m
8344332d332
8345< CONFIG_SND_S3C24XX_SOC=m
8346334a335
8347> CONFIG_SND_SOC=m
8348337d337
8349< CONFIG_SND_SOC=m
8350343a344
8351> CONFIG_SPI=y
8352347d347
8353< CONFIG_SPI_S3C24XX_GPIO=y
8354348a349
8355> CONFIG_SPI_S3C24XX_GPIO=y
8356350d350
8357< CONFIG_SPI=y
8358353d352
8359< CONFIG_SUSPEND_FREEZER=y
8360354a354
8361> CONFIG_SUSPEND_FREEZER=y
8362356d355
8363< CONFIG_SYSFS_DEPRECATED_V2=y
8364357a357
8365> CONFIG_SYSFS_DEPRECATED_V2=y
8366359a360
8367> CONFIG_TOUCHSCREEN_FILTER=y
8368364,365d364
8369< CONFIG_TOUCHSCREEN_FILTER=y
8370< # CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
8371366a366
8372> # CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
8373369a370
8374> CONFIG_USB=y
8375374d374
8376< CONFIG_USB_ETH_RNDIS=y
8377375a376
8378> CONFIG_USB_ETH_RNDIS=y
8379376a378,380
8380> CONFIG_USB_GADGET=y
8381> # CONFIG_USB_GADGETFS is not set
8382> # CONFIG_USB_GADGET_DEBUG_FS is not set
8383382d385
8384< # CONFIG_USB_GADGET_DEBUG_FS is not set
8385385d387
8386< # CONFIG_USB_GADGETFS is not set
8387400d401
8388< CONFIG_USB_GADGET=y
8389409d409
8390< # CONFIG_USB_S3C2410_DEBUG is not set
8391410a411
8392> # CONFIG_USB_S3C2410_DEBUG is not set
8393413d413
8394< CONFIG_USB=y
8395420a421
8396> CONFIG_VT=y
8397423d423
8398< CONFIG_VT=y
8399diff -r WNDR4300v2-basecompare/target/linux/s3c24xx/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/s3c24xx/config-2.6.31
840017d16
8401< CONFIG_ARM_THUMB=y
840218a18
8403> CONFIG_ARM_THUMB=y
840423a24
8405> CONFIG_BASE_SMALL=0
840626a28
8407> CONFIG_BLK_DEV_RAM=y
840829d30
8409< CONFIG_BLK_DEV_RAM=y
841037d37
8411< CONFIG_CPU_32v4T=y
841238a39
8413> CONFIG_CPU_32v4T=y
841444d44
8415< CONFIG_CPU_CP15_MMU=y
841645a46
8417> CONFIG_CPU_CP15_MMU=y
841848d48
8419< CONFIG_CPU_IDLE_GOV_LADDER=y
842050c50
8421< CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
8422---
8423> CONFIG_CPU_IDLE_GOV_LADDER=y
842451a52
8425> CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
842662d62
8427< CONFIG_CRYPTO_HASH2=y
842863a64
8429> CONFIG_CRYPTO_HASH2=y
843077a79
8431> CONFIG_FB=y
843281d82
8433< CONFIG_FB=y
843483a85
8435> CONFIG_FONTS=y
843694d95
8437< CONFIG_FONTS=y
843896d96
8439< # CONFIG_FPE_NWFPE_XP is not set
844097a98,99
8441> # CONFIG_FPE_NWFPE_XP is not set
8442> CONFIG_FRAMEBUFFER_CONSOLE=y
8443100d101
8444< CONFIG_FRAMEBUFFER_CONSOLE=y
8445122d122
8446< CONFIG_HAVE_MLOCKED_PAGE_BIT=y
8447123a124
8448> CONFIG_HAVE_MLOCKED_PAGE_BIT=y
8449126a128
8450> CONFIG_HID=y
8451152d153
8452< CONFIG_HID=y
8453156a158
8454> CONFIG_I2C=y
8455161d162
8456< CONFIG_I2C=y
8457165a167
8458> CONFIG_INPUT=y
8459169a172
8460> CONFIG_INPUT_MOUSEDEV=y
8461173d175
8462< CONFIG_INPUT_MOUSEDEV=y
8463176d177
8464< CONFIG_INPUT=y
8465177a179
8466> CONFIG_IP_PNP=y
8467181d182
8468< CONFIG_IP_PNP=y
8469208c209
8470< CONFIG_LOG_BUF_SHIFT=18
8471---
8472> CONFIG_LOGO=y
8473212c213
8474< CONFIG_LOGO=y
8475---
8476> CONFIG_LOG_BUF_SHIFT=18
8477220d220
8478< CONFIG_MACH_NEO1973_GTA02=y
8479221a222
8480> CONFIG_MACH_NEO1973_GTA02=y
8481233a235
8482> CONFIG_MFD_GLAMO=y
8483237d238
8484< CONFIG_MFD_GLAMO=y
8485242d242
8486< CONFIG_MMC_BLOCK=y
8487243a244
8488> CONFIG_MMC_BLOCK=y
8489249a251,252
8490> CONFIG_MTD_NAND=y
8491> CONFIG_MTD_NAND_S3C2410=y
8492253d255
8493< CONFIG_MTD_NAND_S3C2410=y
8494255d256
8495< CONFIG_MTD_NAND=y
8496259d259
8497< # CONFIG_NET_CLS_ACT is not set
8498260a261,262
8499> # CONFIG_NETWORK_FILESYSTEMS is not set
8500> # CONFIG_NET_CLS_ACT is not set
8501263d264
8502< # CONFIG_NETWORK_FILESYSTEMS is not set
8503271d271
8504< # CONFIG_PCI is not set
8505274d273
8506< CONFIG_PLAT_S3C24XX=y
8507275a275,276
8508> CONFIG_PLAT_S3C24XX=y
8509> CONFIG_PM=y
8510278,279d278
8511< CONFIG_PM=y
8512< # CONFIG_POWER_SUPPLY_DEBUG is not set
8513280a280
8514> # CONFIG_POWER_SUPPLY_DEBUG is not set
8515284a285
8516> CONFIG_REGULATOR=y
8517290c291
8518< CONFIG_REGULATOR=y
8519---
8520> CONFIG_RFKILL=y
8521293d293
8522< CONFIG_RFKILL=y
8523300d299
8524< # CONFIG_S3C2410_DMA_DEBUG is not set
8525301a301
8526> # CONFIG_S3C2410_DMA_DEBUG is not set
8527302a303
8528> CONFIG_S3C2410_PM=y
8529305d305
8530< CONFIG_S3C2410_PM=y
8531322a323
8532> CONFIG_SERIAL_SAMSUNG=y
8533325c326
8534< CONFIG_SERIAL_SAMSUNG=y
8535---
8536> CONFIG_SERIO=y
8537328d328
8538< CONFIG_SERIO=y
8539330a331
8540> CONFIG_SND=m
8541334d334
8542< CONFIG_SND=m
8543338a339
8544> CONFIG_SND_S3C24XX_SOC=m
8545341d341
8546< CONFIG_SND_S3C24XX_SOC=m
8547344a345
8548> CONFIG_SND_SOC=m
8549347d347
8550< CONFIG_SND_SOC=m
8551353a354
8552> CONFIG_SPI=y
8553357d357
8554< CONFIG_SPI_S3C24XX_GPIO=y
8555358a359
8556> CONFIG_SPI_S3C24XX_GPIO=y
8557360d360
8558< CONFIG_SPI=y
8559363d362
8560< CONFIG_SUSPEND_FREEZER=y
8561364a364
8562> CONFIG_SUSPEND_FREEZER=y
8563366d365
8564< CONFIG_SYSFS_DEPRECATED_V2=y
8565367a367
8566> CONFIG_SYSFS_DEPRECATED_V2=y
8567369a370
8568> CONFIG_TOUCHSCREEN_FILTER=y
8569374,375d374
8570< CONFIG_TOUCHSCREEN_FILTER=y
8571< # CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
8572376a376
8573> # CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
8574379a380
8575> CONFIG_USB=y
8576385d385
8577< CONFIG_USB_ETH_RNDIS=y
8578386a387
8579> CONFIG_USB_ETH_RNDIS=y
8580387a389,390
8581> CONFIG_USB_GADGET=y
8582> # CONFIG_USB_GADGETFS is not set
8583395d397
8584< # CONFIG_USB_GADGETFS is not set
8585412d413
8586< CONFIG_USB_GADGET=y
8587421d421
8588< # CONFIG_USB_S3C2410_DEBUG is not set
8589422a423
8590> # CONFIG_USB_S3C2410_DEBUG is not set
8591425d425
8592< CONFIG_USB=y
8593432a433
8594> CONFIG_VT=y
8595435d435
8596< CONFIG_VT=y
8597diff -r WNDR4300v2-basecompare/target/linux/sibyte/config-default WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/sibyte/config-default
85980a1,3
8599> CONFIG_HWMON=y
8600> CONFIG_SENSORS_LM90=y
8601> CONFIG_HWMON_DEBUG_CHIP=y
860210a14
8603> CONFIG_BASE_SMALL=0
860487,88d90
8605< CONFIG_HWMON_DEBUG_CHIP=y
8606< CONFIG_HWMON=y
860794a97
8608> # CONFIG_I2C is not set
8609155a159
8610> # CONFIG_PCSPKR_PLATFORM is not set
8611179d182
8612< CONFIG_SENSORS_LM90=y
8613216a220
8614> CONFIG_TICK_ONESHOT=y
8615Seulement dans WNDR4300v2-basecompare/target/linux/sibyte: profiles
8616diff -r WNDR4300v2-basecompare/target/linux/ubicom32/config-2.6.28 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/ubicom32/config-2.6.28
86176a7
8618> CONFIG_BASE_SMALL=0
861911a13
8620> CONFIG_BLK_DEV_RAM=y
862114d15
8622< CONFIG_BLK_DEV_RAM=y
862320d20
8624< CONFIG_CMDLINE_BOOL=y
862521a22
8626> CONFIG_CMDLINE_BOOL=y
862727d27
8628< CONFIG_CRYPTO_ALGAPI2=y
862928a29
8630> CONFIG_CRYPTO_ALGAPI2=y
863130d30
8632< CONFIG_CRYPTO_BLKCIPHER2=y
863331a32
8634> CONFIG_CRYPTO_BLKCIPHER2=y
863535d35
8636< CONFIG_CRYPTO_MANAGER2=y
863736a37
8638> CONFIG_CRYPTO_MANAGER2=y
863955d55
8640< CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
864156a57
8642> CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
864367d67
8644< CONFIG_HW_RANDOM_UBICOM32=y
864568a69,70
8646> CONFIG_HW_RANDOM_UBICOM32=y
8647> # CONFIG_I2C is not set
864873a76
8649> CONFIG_INPUT=y
865076d78
8651< CONFIG_INPUT=y
865288d89
8653< CONFIG_IRQ_PER_CPU=y
865489a91
8655> CONFIG_IRQ_PER_CPU=y
865698d99
8657< CONFIG_LEGACY_PTY_COUNT=256
865899a101
8659> CONFIG_LEGACY_PTY_COUNT=256
8660119a122
8661> CONFIG_PCI=y
8662131d133
8663< CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE=y
8664132a135
8665> CONFIG_SERIAL_UBI32_MAILBOX_CONSOLE=y
8666135a139,140
8667> # CONFIG_SMP is not set
8668> CONFIG_SPI=y
8669141d145
8670< CONFIG_SPI=y
8671145d148
8672< CONFIG_SYSFS_DEPRECATED_V2=y
8673147,148c150,151
8674< CONFIG_TIME_LOW_RES=y
8675< CONFIG_TIMER_EXTRA_ALLOC=0
8676---
8677> CONFIG_SYSFS_DEPRECATED_V2=y
8678> CONFIG_TICK_ONESHOT=y
8679149a153,154
8680> CONFIG_TIMER_EXTRA_ALLOC=0
8681> CONFIG_TIME_LOW_RES=y
8682151a157
8683> CONFIG_UBICOM32=y
8684156d161
8685< CONFIG_UBICOM32=y
8686158d162
8687< # CONFIG_UBICOM_INPUT_I2C is not set
8688159a164
8689> # CONFIG_UBICOM_INPUT_I2C is not set
8690diff -r WNDR4300v2-basecompare/target/linux/uml/config/i386 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/uml/config/i386
8691170d169
8692< # CONFIG_PCI is not set
8693diff -r WNDR4300v2-basecompare/target/linux/uml/config/x86_64 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/uml/config/x86_64
8694127d126
8695< # CONFIG_PCI is not set
8696Seulement dans WNDR4300v2-basecompare/target/linux/uml: profiles
8697Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux: wndr4500v3
8698Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86: config-2.6.28
8699diff -r WNDR4300v2-basecompare/target/linux/x86/config-2.6.30 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/config-2.6.30
870028a29
8701> CONFIG_ATA=y
870229a31
8703> # CONFIG_ATA_NONSTANDARD is not set
870431c33
8705< CONFIG_ATA=y
8706---
8707> CONFIG_ATA_SFF=y
870832a35
8709> CONFIG_BASE_SMALL=0
871044a48
8711> CONFIG_CPU_FREQ=y
871256d59
8713< CONFIG_CPU_FREQ_STAT_DETAILS=y
871457a61
8715> CONFIG_CPU_FREQ_STAT_DETAILS=y
871659d62
8717< CONFIG_CPU_FREQ=y
871879d81
8719< # CONFIG_DMIID is not set
872080a83
8721> # CONFIG_DMIID is not set
872284d86
8723< # CONFIG_EARLY_PRINTK_DBGP is not set
872485a88
8725> # CONFIG_EARLY_PRINTK_DBGP is not set
872689d91
8727< # CONFIG_EL16 is not set
872890a93
8729> # CONFIG_EL16 is not set
8730104a108
8731> CONFIG_GENERIC_CLOCKEVENTS=y
8732107d110
8733< CONFIG_GENERIC_CLOCKEVENTS=y
8734133d135
8735< CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
8736134a137
8737> CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
8738143d145
8739< CONFIG_HAVE_KVM_IRQCHIP=y
8740144a147
8741> CONFIG_HAVE_KVM_IRQCHIP=y
8742151d153
8743< CONFIG_HID_SUPPORT=y
8744152a155
8745> CONFIG_HID_SUPPORT=y
8746160a164
8747> CONFIG_HW_RANDOM=y
8748165c169
8749< CONFIG_HW_RANDOM=y
8750---
8751> # CONFIG_I2C is not set
8752169d172
8753< # CONFIG_IBM_ASM is not set
8754170a174
8755> # CONFIG_IBM_ASM is not set
8756171a176
8757> CONFIG_INPUT=y
8758172a178,179
8759> CONFIG_INPUT_MOUSE=y
8760> CONFIG_INPUT_MOUSEDEV=y
8761176,178d182
8762< CONFIG_INPUT_MOUSEDEV=y
8763< CONFIG_INPUT_MOUSE=y
8764< CONFIG_INPUT=y
8765179a184,185
8766> # CONFIG_IOMMU_API is not set
8767> # CONFIG_IOMMU_HELPER is not set
8768188,191d193
8769< # CONFIG_IOMMU_API is not set
8770< # CONFIG_IOMMU_HELPER is not set
8771< CONFIG_ISA_DMA_API=y
8772< CONFIG_ISAPNP=y
8773192a195,196
8774> CONFIG_ISAPNP=y
8775> CONFIG_ISA_DMA_API=y
8776229a234
8777> CONFIG_MICROCODE=y
8778233d237
8779< CONFIG_MICROCODE=y
8780239a244
8781> CONFIG_MOUSE_PS2=y
8782247d251
8783< CONFIG_MOUSE_PS2=y
8784251d254
8785< # CONFIG_MPENTIUMIII is not set
8786252a256
8787> # CONFIG_MPENTIUMIII is not set
8788259d262
8789< # CONFIG_MTRR_SANITIZER is not set
8790260a264
8791> # CONFIG_MTRR_SANITIZER is not set
8792265a270
8793> # CONFIG_NATSEMI is not set
8794286a292,293
8795> CONFIG_PCI=y
8796> # CONFIG_PCIEPORTBUS is not set
8797290d296
8798< # CONFIG_PCIEPORTBUS is not set
8799299a306
8800> CONFIG_PNP=y
8801303d309
8802< CONFIG_PNP=y
8803319d324
8804< # CONFIG_SCSI_LOWLEVEL is not set
8805321c326,327
8806< # CONFIG_SCx200_GPIO is not set
8807---
8808> # CONFIG_SCSI_LOWLEVEL is not set
8809> CONFIG_SCx200=y
8810322a329
8811> # CONFIG_SCx200_GPIO is not set
8812324d330
8813< CONFIG_SCx200=y
8814327a334
8815> CONFIG_SERIO=y
8816334d340
8817< CONFIG_SERIO=y
8818337c343
8819< # CONFIG_SLUB_DEBUG_ON is not set
8820---
8821> CONFIG_SLUB=y
8822338a345
8823> # CONFIG_SLUB_DEBUG_ON is not set
8824340c347
8825< CONFIG_SLUB=y
8826---
8827> # CONFIG_SMP is not set
8828344d350
8829< # CONFIG_SPARSE_IRQ is not set
8830345a352
8831> # CONFIG_SPARSE_IRQ is not set
8832360a368
8833> CONFIG_VT=y
8834363d370
8835< CONFIG_VT=y
8836367c374
8837< CONFIG_X86_32_LAZY_GS=y
8838---
8839> CONFIG_X86=y
8840368a376
8841> CONFIG_X86_32_LAZY_GS=y
8842372c380
8843< # CONFIG_X86_CPU_DEBUG is not set
8844---
8845> CONFIG_X86_CPU=y
8846375c383
8847< CONFIG_X86_CPU=y
8848---
8849> # CONFIG_X86_CPU_DEBUG is not set
8850377d384
8851< # CONFIG_X86_E_POWERSAVER is not set
8852378a386
8853> # CONFIG_X86_E_POWERSAVER is not set
8854388a397
8855> CONFIG_X86_MCE=y
8856391d399
8857< CONFIG_X86_MCE=y
8858413d420
8859< CONFIG_X86=y
8860diff -r WNDR4300v2-basecompare/target/linux/x86/config-2.6.31 WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/config-2.6.31
886128a29
8862> CONFIG_ATA=y
886329a31
8864> # CONFIG_ATA_NONSTANDARD is not set
886531c33
8866< CONFIG_ATA=y
8867---
8868> CONFIG_ATA_SFF=y
886932a35
8870> CONFIG_BASE_SMALL=0
887145a49
8872> CONFIG_CPU_FREQ=y
887357d60
8874< CONFIG_CPU_FREQ_STAT_DETAILS=y
887558a62
8876> CONFIG_CPU_FREQ_STAT_DETAILS=y
887760d63
8878< CONFIG_CPU_FREQ=y
887980d82
8880< # CONFIG_DMIID is not set
888181a84
8882> # CONFIG_DMIID is not set
888385d87
8884< # CONFIG_EARLY_PRINTK_DBGP is not set
888586a89
8886> # CONFIG_EARLY_PRINTK_DBGP is not set
888790d92
8888< # CONFIG_EL16 is not set
888991a94
8890> # CONFIG_EL16 is not set
889195a99
8892> # CONFIG_EMBEDDED is not set
8893104a109
8894> CONFIG_GENERIC_CLOCKEVENTS=y
8895107d111
8896< CONFIG_GENERIC_CLOCKEVENTS=y
8897136d139
8898< CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
8899137a141
8900> CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
8901146d149
8902< CONFIG_HAVE_KVM_IRQCHIP=y
8903147a151
8904> CONFIG_HAVE_KVM_IRQCHIP=y
8905149d152
8906< CONFIG_HAVE_MLOCKED_PAGE_BIT=y
8907150a154
8908> CONFIG_HAVE_MLOCKED_PAGE_BIT=y
8909155d158
8910< CONFIG_HID_SUPPORT=y
8911156a160
8912> CONFIG_HID_SUPPORT=y
8913164a169
8914> CONFIG_HW_RANDOM=y
8915169c174
8916< CONFIG_HW_RANDOM=y
8917---
8918> # CONFIG_I2C is not set
8919173d177
8920< # CONFIG_IBM_ASM is not set
8921174a179
8922> # CONFIG_IBM_ASM is not set
8923175a181
8924> CONFIG_INPUT=y
8925176a183,184
8926> CONFIG_INPUT_MOUSE=y
8927> CONFIG_INPUT_MOUSEDEV=y
8928180,182d187
8929< CONFIG_INPUT_MOUSEDEV=y
8930< CONFIG_INPUT_MOUSE=y
8931< CONFIG_INPUT=y
8932183a189,191
8933> # CONFIG_IOMMU_API is not set
8934> # CONFIG_IOMMU_HELPER is not set
8935> # CONFIG_IOMMU_STRESS is not set
8936192,196d199
8937< # CONFIG_IOMMU_API is not set
8938< # CONFIG_IOMMU_HELPER is not set
8939< # CONFIG_IOMMU_STRESS is not set
8940< CONFIG_ISA_DMA_API=y
8941< CONFIG_ISAPNP=y
8942197a201,202
8943> CONFIG_ISAPNP=y
8944> CONFIG_ISA_DMA_API=y
8945235a241
8946> CONFIG_MICROCODE=y
8947239d244
8948< CONFIG_MICROCODE=y
8949244a250
8950> CONFIG_MOUSE_PS2=y
8951252d257
8952< CONFIG_MOUSE_PS2=y
8953256d260
8954< # CONFIG_MPENTIUMIII is not set
8955257a262
8956> # CONFIG_MPENTIUMIII is not set
8957264d268
8958< # CONFIG_MTRR_SANITIZER is not set
8959265a270
8960> # CONFIG_MTRR_SANITIZER is not set
8961270a276
8962> # CONFIG_NATSEMI is not set
8963292a299,300
8964> CONFIG_PCI=y
8965> # CONFIG_PCIEPORTBUS is not set
8966296d303
8967< # CONFIG_PCIEPORTBUS is not set
8968305a313
8969> CONFIG_PNP=y
8970309,310d316
8971< CONFIG_PNP=y
8972< # CONFIG_PROCESSOR_SELECT is not set
8973325d330
8974< # CONFIG_SCSI_LOWLEVEL is not set
8975327c332,333
8976< # CONFIG_SCx200_GPIO is not set
8977---
8978> # CONFIG_SCSI_LOWLEVEL is not set
8979> CONFIG_SCx200=y
8980328a335
8981> # CONFIG_SCx200_GPIO is not set
8982330d336
8983< CONFIG_SCx200=y
8984333a340
8985> CONFIG_SERIO=y
8986340d346
8987< CONFIG_SERIO=y
8988343c349
8989< # CONFIG_SLUB_DEBUG_ON is not set
8990---
8991> CONFIG_SLUB=y
8992344a351
8993> # CONFIG_SLUB_DEBUG_ON is not set
8994346c353
8995< CONFIG_SLUB=y
8996---
8997> # CONFIG_SMP is not set
8998350d356
8999< # CONFIG_SPARSE_IRQ is not set
9000351a358
9001> # CONFIG_SPARSE_IRQ is not set
9002365a373
9003> CONFIG_VT=y
9004368d375
9005< CONFIG_VT=y
9006372c379
9007< CONFIG_X86_32_LAZY_GS=y
9008---
9009> CONFIG_X86=y
9010373a381
9011> CONFIG_X86_32_LAZY_GS=y
9012378c386
9013< # CONFIG_X86_CPU_DEBUG is not set
9014---
9015> CONFIG_X86_CPU=y
9016381c389
9017< CONFIG_X86_CPU=y
9018---
9019> # CONFIG_X86_CPU_DEBUG is not set
9020383d390
9021< # CONFIG_X86_E_POWERSAVER is not set
9022384a392
9023> # CONFIG_X86_E_POWERSAVER is not set
9024394a403
9025> CONFIG_X86_MCE=y
9026399d407
9027< CONFIG_X86_MCE=y
9028409d416
9029< CONFIG_X86_PM_TIMER=y
9030425d431
9031< CONFIG_X86=y
9032diff -r WNDR4300v2-basecompare/target/linux/x86/image/Config.in WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/image/Config.in
90333c3
9034<     depends TARGET_x86 && !TARGET_x86_olpc
9035---
9036>     depends TARGET_x86
903741c41
9038<     depends TARGET_x86_generic
9039---
9040>     depends TARGET_x86
904148c48
9042<     depends TARGET_x86_generic
9043---
9044>     depends TARGET_x86
904552,75d51
9046< 
9047< config OLPC_BOOTSCRIPT_IMAGES
9048<     bool "Build images with bootscript"
9049<     depends TARGET_x86_olpc
9050<     depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
9051<     default y
9052< 
9053< config OLPC_BOOTSCRIPT_IMAGES_PAD
9054< 	bool "Pad bootscript images to filesystem size (for JFFS2)"
9055< 	depends OLPC_BOOTSCRIPT_IMAGES
9056< 
9057< config OLPC_BOOTSCRIPT_KERNELPART
9058<     int "Kernel partition size (in MB)"
9059<     depends OLPC_BOOTSCRIPT_IMAGES
9060<     default 4
9061< 
9062< config OLPC_BOOTSCRIPT_ROOTPART
9063<     string
9064<     prompt "Root partition on target device" if OLPC_BOOTSCRIPT_IMAGES
9065<     default "/dev/sda2"
9066<     help
9067<         The root partition on the final device.  If you don't know,
9068<         you probably want the default (/dev/sda2).
9069< 
9070Seulement dans WNDR4300v2-basecompare/target/linux/x86/image: gen_image_olpc.sh
9071Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/image: gen_image.sh
9072Seulement dans WNDR4300v2-basecompare/target/linux/x86/image: gen_image_x86.sh
9073diff -r WNDR4300v2-basecompare/target/linux/x86/image/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/image/Makefile
907411,12d10
9075< 
9076< ifneq ($(CONFIG_TARGET_x86_olpc),y)
907716d13
9078< endif
907918,21d14
9080< ifeq ($(CONFIG_TARGET_x86_olpc),y)
9081< ROOTPART=$(strip $(subst ",, $(CONFIG_OLPC_BOOTSCRIPT_ROOTPART)))
9082< endif
9083< #"))")) # fix vim's broken syntax highlighting
908452c45
9085< 	PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
9086---
9087> 	PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
908866c59
9089< 	PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) "" $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
9090---
9091> 	PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) "" $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
909292,120d84
9093< ROOTDELAY=10
9094< 
9095< ifeq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),y)
9096<   define Image/cmdline/squashfs
9097<     block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootdelay=$(ROOTDELAY)
9098<   endef
9099< 
9100<   define Image/cmdline/jffs2-64k
9101<     block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootdelay=$(ROOTDELAY)
9102<   endef
9103< 
9104<   define Image/cmdline/jffs2-128k
9105<     block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootdelay=$(ROOTDELAY)
9106<   endef
9107< 
9108<   define Image/cmdline/ext2
9109<     root=$(ROOTPART) rootfstype=ext2 rootwait
9110<   endef
9111< 
9112<   define Image/Build/bootscript
9113< 	# left here because the image builder doesnt need these
9114< 	$(INSTALL_DIR) $(KDIR)/root.bootscript/boot
9115< 	$(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz
9116< 	sed -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
9117< 		./olpc.fth > $(KDIR)/root.bootscript/boot/olpc.fth
9118< 	PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
9119<   endef
9120< endif
9121< 
9122123,125d86
9123< ifeq ($(CONFIG_TARGET_x86_olpc),y)
9124< 	$(call Image/Prepare/bootscript)
9125< else
9126127d87
9127< endif
9128129c89
9129< 
9130---
9131>   
9132155d114
9133< 	$(call Image/Build/bootscript,$(1))
9134Seulement dans WNDR4300v2-basecompare/target/linux/x86/image: olpc.fth
9135diff -r WNDR4300v2-basecompare/target/linux/x86/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/Makefile
913613c13,14
9137< SUBTARGETS=generic olpc
9138---
9139> CUSTOMER:=openwrt
9140> SUBTARGETS=generic
9141Seulement dans WNDR4300v2-basecompare/target/linux/x86: olpc
9142diff -r WNDR4300v2-basecompare/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch
91433c3
9144< @@ -236,7 +236,7 @@ static int sc1200_init_one(struct pci_de
9145---
9146> @@ -236,7 +236,7 @@
9147Seulement dans WNDR4300v2-basecompare/target/linux/x86/patches-2.6.30: 300-block2mtd_init.patch
9148diff -r WNDR4300v2-basecompare/target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch
91491,3c1,5
9150< --- a/drivers/ata/pata_sc1200.c
9151< +++ b/drivers/ata/pata_sc1200.c
9152< @@ -236,7 +236,7 @@ static int sc1200_init_one(struct pci_de
9153---
9154> Index: linux-2.6.31.5/drivers/ata/pata_sc1200.c
9155> ===================================================================
9156> --- linux-2.6.31.5.orig/drivers/ata/pata_sc1200.c	2009-10-23 00:57:56.000000000 +0200
9157> +++ linux-2.6.31.5/drivers/ata/pata_sc1200.c	2009-10-23 12:45:54.000000000 +0200
9158> @@ -236,7 +236,7 @@
9159Seulement dans WNDR4300v2-basecompare/target/linux/x86/patches-2.6.31: 300-block2mtd_init.patch
9160diff -r WNDR4300v2-basecompare/target/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/target/Makefile
91619c9
9162< $(curdir)/builddirs:=linux sdk imagebuilder toolchain
9163---
9164> $(curdir)/builddirs:=linux sdk imagebuilder
916511c11
9166< $(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder) $(if $(CONFIG_MAKE_TOOLCHAIN),toolchain)
9167---
9168> $(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder)
9169Seulement dans WNDR4300v2-basecompare/target: toolchain
9170Seulement dans WNDR4300v2-basecompare: toolchain
9171Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools: appendsum
9172diff -r WNDR4300v2-basecompare/tools/automake/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/automake/Makefile
917310c10
9174< PKG_VERSION:=1.10
9175---
9176> PKG_VERSION:=1.9.6
917714c14
9178< PKG_MD5SUM:=
9179---
9180> PKG_MD5SUM:=c11b8100bb311492d8220378fd8bf9e0
918133d32
9182< 	ln -f $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10
9183Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools: checksize
9184Seulement dans WNDR4300v2-basecompare/tools: cloog
9185Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools: dtc
9186diff -r WNDR4300v2-basecompare/tools/firmware-utils/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/firmware-utils/Makefile
918746a47
9188> 	$(call cc,crc-check)
918955a57,58
9190> 	$(call cc,wndr4300)
9191> 	$(call cc,wndr4500v3)
9192Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/firmware-utils/src: crc-check.c
9193diff -r WNDR4300v2-basecompare/tools/firmware-utils/src/mkdniimg.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/firmware-utils/src/mkdniimg.c
919432a33
9195> static char *hw_id;
919658a60
9197> "  -H <hw_id>      set image hardware id to <hw_id>\n"
919886c88
9199< 		c = getopt(argc, argv, "B:i:o:v:r:h");
9200---
9201> 		c = getopt(argc, argv, "B:H:i:o:v:r:h");
920293a96,98
9203> 		case 'H':
9204> 			hw_id = optarg;
9205> 			break;
9206119a125,129
9207> 	if (hw_id == NULL) {
9208> 		ERR("no hardware specified");
9209> 		goto err;
9210> 	}
9211> 
9212144,145c154,155
9213< 	snprintf(buf, DNI_HDR_LEN, "device:%s\nversion:V%s\nregion:%s\n",
9214< 		 board_id, version, region);
9215---
9216> 	snprintf(buf, DNI_HDR_LEN, "device:%s\nversion:%s\nregion:%s\nhd_id:%s\n",
9217> 		 board_id, version, region, hw_id);
9218diff -r WNDR4300v2-basecompare/tools/firmware-utils/src/mkfwimage.c WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/firmware-utils/src/mkfwimage.c
921958c58
9220< 		.firmware_max_length=	0x00B00000,
9221---
9222> 		.firmware_max_length=	0x00640000,
922364c64
9224< 		.firmware_max_length=	0x00B00000,
9225---
9226> 		.firmware_max_length=	0x00640000,
922778,83d77
9228< 	{
9229< 		.name		=	"XM",
9230< 		.kern_start	=	0x9f050000,
9231< 		.kern_entry	=	0x80002000,
9232< 		.firmware_max_length=	0x006A0000,
9233< 	},
9234188c182
9235< 	     "\t-B <board name>\t\t - choose firmware layout for specified board (XS2, XS5, RS, XM)\n"
9236---
9237> 	     "\t-B <board name>\t\t - choose firmware layout for specified board (XS2, XS5, RS)\n"
9238Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/firmware-utils/src: wndr4300.c
9239Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/firmware-utils/src: wndr4500v3.c
9240diff -r WNDR4300v2-basecompare/tools/lzma/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/lzma/Makefile
924130d29
9242< 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma
9243diff -r WNDR4300v2-basecompare/tools/Makefile WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/Makefile
924413d12
9245< ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
924615d13
9247< endif
924817c15
9249< tools-y += sstrip ipkg-utils genext2fs mtd-utils mkimage
9250---
9251> tools-y += sstrip ipkg-utils genext2fs squashfs squashfs4 mtd-utils lzma-old mkimage squashfs-2.1-r2
925219,23d16
9253< ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),)
9254< tools-y += squashfs lzma-old 
9255< else
9256< tools-y += squashfs4 lzma
9257< endif
925826,30c19,20
9259< 
9260< ifdef CONFIG_GCC_USE_GRAPHITE
9261<   tools-y += ppl cloog
9262<   $(curdir)/cloog/compile := $(curdir)/ppl/install
9263< endif
9264---
9265> tools-$(CONFIG_powerpc) += dtc
9266> tools-dep += lzma
926789c79
9268< $(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_3 CONFIG_GCC_USE_GRAPHITE))
9269---
9270> $(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_3))
9271diff -r WNDR4300v2-basecompare/tools/mkimage/src/image.h WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/mkimage/src/image.h
9272138c138
9273< #define IH_MAGIC	0x27051956	/* Image Magic Number		*/
9274---
9275> #define IH_MAGIC	0x33373033	/* Image Magic Number		*/
9276Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/mklibs/patches: 009-include-unistd.patch
9277Seulement dans WNDR4300v2-basecompare/tools/mklibs/patches: 009-uclibc_libgcc_link.patch
9278Seulement dans WNDR4300v2-basecompare/tools: ppl
9279Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools: squashfs-2.1-r2
9280diff -r WNDR4300v2-basecompare/tools/squashfs4/patches/110-lzma.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/squashfs4/patches/110-lzma.patch
92811,416c1,5
9282< diff -Nur squashfs4.0/squashfs-tools/compressor.c squashfs4.0-lzma-snapshot/squashfs-tools/compressor.c
9283< --- squashfs4.0/squashfs-tools/compressor.c	1970-01-01 01:00:00.000000000 +0100
9284< +++ squashfs4.0-lzma-snapshot/squashfs-tools/compressor.c	2009-10-20 06:03:37.000000000 +0200
9285< @@ -0,0 +1,78 @@
9286< +/*
9287< + *
9288< + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
9289< + * Phillip Lougher <phillip@lougher.demon.co.uk>
9290< + *
9291< + * This program is free software; you can redistribute it and/or
9292< + * modify it under the terms of the GNU General Public License
9293< + * as published by the Free Software Foundation; either version 2,
9294< + * or (at your option) any later version.
9295< + *
9296< + * This program is distributed in the hope that it will be useful,
9297< + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9298< + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9299< + * GNU General Public License for more details.
9300< + *
9301< + * You should have received a copy of the GNU General Public License
9302< + * along with this program; if not, write to the Free Software
9303< + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
9304< + *
9305< + * compressor.c
9306< + */
9307< +
9308< +#include <stdio.h>
9309< +#include <string.h>
9310< +#include "compressor.h"
9311< +#include "squashfs_fs.h"
9312< +
9313< +extern int gzip_compress(void **, char *, char *, int, int, int *);
9314< +extern int gzip_uncompress(char *, char *, int, int, int *);
9315< +extern int lzma_compress(void **, char *, char *, int, int, int *);
9316< +extern int lzma_uncompress(char *, char *, int, int, int *);
9317< +
9318< +struct compressor compressor[] = {
9319< +	{ gzip_compress, gzip_uncompress, ZLIB_COMPRESSION, "gzip", 1 },
9320< +#ifdef LZMA_SUPPORT
9321< +	{ lzma_compress, lzma_uncompress, LZMA_COMPRESSION, "lzma", 1 },
9322< +#else
9323< +	{ NULL, NULL, LZMA_COMPRESSION, "lzma", 0 },
9324< +#endif
9325< +	{ NULL, NULL , 0, "unknown", 0}
9326< +};
9327< +
9328< +
9329< +struct compressor *lookup_compressor(char *name)
9330< +{
9331< +	int i;
9332< +
9333< +	for(i = 0; compressor[i].id; i++)
9334< +		if(strcmp(compressor[i].name, name) == 0)
9335< +			break;
9336< +
9337< +	return &compressor[i];
9338< +}
9339< +
9340< +
9341< +struct compressor *lookup_compressor_id(int id)
9342< +{
9343< +	int i;
9344< +
9345< +	for(i = 0; compressor[i].id; i++)
9346< +		if(id == compressor[i].id)
9347< +			break;
9348< +
9349< +	return &compressor[i];
9350< +}
9351< +
9352< +
9353< +void display_compressors(char *indent, char *def_comp)
9354< +{
9355< +	int i;
9356< +
9357< +	for(i = 0; compressor[i].id; i++)
9358< +		if(compressor[i].supported)
9359< +			fprintf(stderr, "%s\t%s%s\n", indent,
9360< +				compressor[i].name,
9361< +				strcmp(compressor[i].name, def_comp) == 0 ?
9362< +				" (default)" : "");
9363< +}
9364< diff -Nur squashfs4.0/squashfs-tools/compressor.h squashfs4.0-lzma-snapshot/squashfs-tools/compressor.h
9365< --- squashfs4.0/squashfs-tools/compressor.h	1970-01-01 01:00:00.000000000 +0100
9366< +++ squashfs4.0-lzma-snapshot/squashfs-tools/compressor.h	2009-10-20 06:03:37.000000000 +0200
9367< @@ -0,0 +1,33 @@
9368< +/*
9369< + *
9370< + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
9371< + * Phillip Lougher <phillip@lougher.demon.co.uk>
9372< + *
9373< + * This program is free software; you can redistribute it and/or
9374< + * modify it under the terms of the GNU General Public License
9375< + * as published by the Free Software Foundation; either version 2,
9376< + * or (at your option) any later version.
9377< + *
9378< + * This program is distributed in the hope that it will be useful,
9379< + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9380< + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9381< + * GNU General Public License for more details.
9382< + *
9383< + * You should have received a copy of the GNU General Public License
9384< + * along with this program; if not, write to the Free Software
9385< + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
9386< + *
9387< + * compressor.h
9388< + */
9389< +
9390< +struct compressor {
9391< +	int (*compress)(void **, char *, char *, int, int, int *);
9392< +	int (*uncompress)(char *, char *, int, int, int *);
9393< +	int id;
9394< +	char *name;
9395< +	int supported;
9396< +};
9397< +
9398< +extern struct compressor *lookup_compressor(char *);
9399< +extern struct compressor *lookup_compressor_id(int);
9400< +extern void display_compressors(char *, char *);
9401< diff -Nur squashfs4.0/squashfs-tools/gzip_wrapper.c squashfs4.0-lzma-snapshot/squashfs-tools/gzip_wrapper.c
9402< --- squashfs4.0/squashfs-tools/gzip_wrapper.c	1970-01-01 01:00:00.000000000 +0100
9403< +++ squashfs4.0-lzma-snapshot/squashfs-tools/gzip_wrapper.c	2009-10-20 06:03:37.000000000 +0200
9404< @@ -0,0 +1,80 @@
9405< +/*
9406< + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
9407< + * Phillip Lougher <phillip@lougher.demon.co.uk>
9408< + *
9409< + * This program is free software; you can redistribute it and/or
9410< + * modify it under the terms of the GNU General Public License
9411< + * as published by the Free Software Foundation; either version 2,
9412< + * or (at your option) any later version.
9413< + *
9414< + * This program is distributed in the hope that it will be useful,
9415< + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9416< + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9417< + * GNU General Public License for more details.
9418< + *
9419< + * You should have received a copy of the GNU General Public License
9420< + * along with this program; if not, write to the Free Software
9421< + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
9422< + *
9423< + * gzip_wrapper.c
9424< + */
9425< +
9426< +#include <stdlib.h>
9427< +#include <zlib.h>
9428< +
9429< +int gzip_compress(void **strm, char *d, char *s, int size, int block_size,
9430< +		int *error)
9431< +{
9432< +	int res = 0;
9433< +	z_stream *stream = *strm;
9434< +
9435< +	if(stream == NULL) {
9436< +		if((stream = *strm = malloc(sizeof(z_stream))) == NULL)
9437< +			goto failed;
9438< +
9439< +		stream->zalloc = Z_NULL;
9440< +		stream->zfree = Z_NULL;
9441< +		stream->opaque = 0;
9442< +
9443< +		if((res = deflateInit(stream, 9)) != Z_OK)
9444< +			goto failed;
9445< +	} else if((res = deflateReset(stream)) != Z_OK)
9446< +		goto failed;
9447< +
9448< +	stream->next_in = (unsigned char *) s;
9449< +	stream->avail_in = size;
9450< +	stream->next_out = (unsigned char *) d;
9451< +	stream->avail_out = block_size;
9452< +
9453< +	res = deflate(stream, Z_FINISH);
9454< +	if(res == Z_STREAM_END)
9455< +		/*
9456< +		 * Success, return the compressed size.
9457< +		 */
9458< +		return (int) stream->total_out;
9459< +	if(res == Z_OK)
9460< +		/*
9461< +		 * Output buffer overflow.  Return out of buffer space
9462< +		 */
9463< +		return 0;
9464< +failed:
9465< +	/*
9466< +	 * All other errors return failure, with the compressor
9467< +	 * specific error code in *error
9468< +	 */
9469< +	*error = res;
9470< +	return -1;
9471< +}
9472< +
9473< +
9474< +int gzip_uncompress(char *d, char *s, int size, int block_size, int *error)
9475< +{
9476< +	int res;
9477< +	unsigned long bytes = block_size;
9478< +
9479< +	res = uncompress((unsigned char *) d, &bytes,
9480< +		(const unsigned char *) s, size);
9481< +
9482< +	*error = res;
9483< +	return res == Z_OK ? (int) bytes : -1;
9484< +}
9485< diff -Nur squashfs4.0/squashfs-tools/lzma_wrapper.c squashfs4.0-lzma-snapshot/squashfs-tools/lzma_wrapper.c
9486< --- squashfs4.0/squashfs-tools/lzma_wrapper.c	1970-01-01 01:00:00.000000000 +0100
9487< +++ squashfs4.0-lzma-snapshot/squashfs-tools/lzma_wrapper.c	2009-10-14 05:32:57.000000000 +0200
9488< @@ -0,0 +1,93 @@
9489< +/*
9490< + * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
9491< + * Phillip Lougher <phillip@lougher.demon.co.uk>
9492< + *
9493< + * This program is free software; you can redistribute it and/or
9494< + * modify it under the terms of the GNU General Public License
9495< + * as published by the Free Software Foundation; either version 2,
9496< + * or (at your option) any later version.
9497< + *
9498< + * This program is distributed in the hope that it will be useful,
9499< + * but WITHOUT ANY WARRANTY; without even the implied warranty of
9500< + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9501< + * GNU General Public License for more details.
9502< + *
9503< + * You should have received a copy of the GNU General Public License
9504< + * along with this program; if not, write to the Free Software
9505< + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
9506< + *
9507< + * lzma_wrapper.c
9508< + */
9509< +
9510< +#include <LzmaLib.h>
9511< +
9512< +#define LZMA_HEADER_SIZE	(LZMA_PROPS_SIZE + 8)
9513< +
9514< +int lzma_compress(void **strm, char *dest, char *src,  int size,int block_size,
9515< +		int *error)
9516< +{
9517< +	unsigned char *d = (unsigned char *) dest, *s = (unsigned char *) src;
9518< +	size_t props_size = LZMA_PROPS_SIZE,
9519< +		outlen = block_size - LZMA_HEADER_SIZE;
9520< +	int res;
9521< +
9522< +	res = LzmaCompress(d + LZMA_HEADER_SIZE, &outlen, s, size, d,
9523< +		&props_size, 5, block_size, 3, 0, 2, 32, 1);
9524< +	
9525< +	if(res == SZ_ERROR_OUTPUT_EOF) {
9526< +		/*
9527< +		 * Output buffer overflow.  Return out of buffer space error
9528< +		 */
9529< +		return 0;
9530< +	}
9531< +
9532< +	if(res != SZ_OK) {
9533< +		/*
9534< +		 * All other errors return failure, with the compressor
9535< +		 * specific error code in *error
9536< +		 */
9537< +		*error = res;
9538< +		return -1;
9539< +	}
9540< +
9541< +	/*
9542< +	 * Fill in the 8 byte little endian uncompressed size field in the
9543< +	 * LZMA header.  8 bytes is excessively large for squashfs but
9544< +	 * this is the standard LZMA header and which is expected by the kernel
9545< +	 * code
9546< +	 */
9547< +	d[LZMA_PROPS_SIZE] = size & 255;
9548< +	d[LZMA_PROPS_SIZE + 1] = (size >> 8) & 255;
9549< +	d[LZMA_PROPS_SIZE + 2] = (size >> 16) & 255;
9550< +	d[LZMA_PROPS_SIZE + 3] = (size >> 24) & 255;
9551< +	d[LZMA_PROPS_SIZE + 4] = 0;
9552< +	d[LZMA_PROPS_SIZE + 5] = 0;
9553< +	d[LZMA_PROPS_SIZE + 6] = 0;
9554< +	d[LZMA_PROPS_SIZE + 7] = 0;
9555< +
9556< +	/*
9557< +	 * Success, return the compressed size.  Outlen returned by the LZMA
9558< +	 * compressor does not include the LZMA header space
9559< +	 */
9560< +	return outlen + LZMA_HEADER_SIZE;
9561< +}
9562< +
9563< +
9564< +int lzma_uncompress(char *dest, char *src, int size, int block_size,
9565< +	int *error)
9566< +{
9567< +	unsigned char *d = (unsigned char *) dest, *s = (unsigned char *) src;
9568< +	size_t outlen, inlen = size - LZMA_HEADER_SIZE;
9569< +	int res;
9570< +
9571< +	outlen = s[LZMA_PROPS_SIZE] |
9572< +		(s[LZMA_PROPS_SIZE + 1] << 8) |
9573< +		(s[LZMA_PROPS_SIZE + 2] << 16) |
9574< +		(s[LZMA_PROPS_SIZE + 3] << 24);
9575< +
9576< +	res = LzmaUncompress(d, &outlen, s + LZMA_HEADER_SIZE, &inlen,
9577< +		s, LZMA_PROPS_SIZE);
9578< +	
9579< +	*error = res;
9580< +	return res == SZ_OK ? outlen : -1;
9581< +}
9582< diff -Nur squashfs4.0/squashfs-tools/Makefile squashfs4.0-lzma-snapshot/squashfs-tools/Makefile
9583< --- squashfs4.0/squashfs-tools/Makefile	2009-04-05 04:03:36.000000000 +0200
9584< +++ squashfs4.0-lzma-snapshot/squashfs-tools/Makefile	2009-10-22 06:17:12.000000000 +0200
9585< @@ -1,40 +1,76 @@
9586< +#
9587< +# Building LZMA support
9588< +# Download LZMA sdk (4.65 used in development, other versions may work),
9589< +# set LZMA_DIR to unpacked source, and uncomment next line
9590< +LZMA_SUPPORT = 1
9591< +LZMA_DIR = ../../lzma-4.65
9592< +
9593< +#Compression default.
9594< +COMP_DEFAULT = gzip
9595< +
9596< +INCLUDEDIR = -I.
9597<  INSTALL_DIR = /usr/local/bin
9598<  
9599< -INCLUDEDIR = .
9600< +MKSQUASHFS_OBJS = mksquashfs.o read_fs.o sort.o swap.o pseudo.o compressor.o \
9601< +	gzip_wrapper.o
9602< +
9603< +UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \
9604< +	unsquash-4.o swap.o compressor.o gzip_wrapper.o
9605<  
9606< -CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
9607< +CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
9608< +	-D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall
9609<  
9610< +ifdef LZMA_SUPPORT
9611< +LZMA_OBJS = $(LZMA_DIR)/C/Alloc.o $(LZMA_DIR)/C/LzFind.o \
9612< +	$(LZMA_DIR)/C/LzmaDec.o $(LZMA_DIR)/C/LzmaEnc.o $(LZMA_DIR)/C/LzmaLib.o
9613< +INCLUDEDIR += -I$(LZMA_DIR)/C
9614< +CFLAGS += -DLZMA_SUPPORT
9615< +MKSQUASHFS_OBJS += lzma_wrapper.o $(LZMA_OBJS)
9616< +UNSQUASHFS_OBJS += lzma_wrapper.o $(LZMA_OBJS)
9617< +endif
9618< +
9619< +.PHONY: all
9620<  all: mksquashfs unsquashfs
9621<  
9622< -mksquashfs: mksquashfs.o read_fs.o sort.o swap.o pseudo.o
9623< -	$(CC) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@
9624< +mksquashfs: $(MKSQUASHFS_OBJS)
9625< +	$(CC) $(MKSQUASHFS_OBJS) -lz -lpthread -lm -o $@
9626< +
9627< +mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \
9628< +	squashfs_swap.h
9629<  
9630< -mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h squashfs_swap.h Makefile
9631< +read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h
9632<  
9633< -read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h Makefile
9634< +sort.o: sort.c squashfs_fs.h global.h sort.h
9635<  
9636< -sort.o: sort.c squashfs_fs.h global.h sort.h Makefile
9637< +swap.o: swap.c
9638<  
9639< -swap.o: swap.c Makefile
9640< +pseudo.o: pseudo.c pseudo.h
9641<  
9642< -pseudo.o: pseudo.c pseudo.h Makefile
9643< +compressor.o: compressor.c compressor.h
9644<  
9645< -unsquashfs: unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o
9646< -	$(CC) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@
9647< +unsquashfs: $(UNSQUASHFS_OBJS)
9648< +	$(CC) $(UNSQUASHFS_OBJS) -lz -lpthread -lm -o $@
9649<  
9650< -unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile
9651< +unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \
9652< +	squashfs_compat.h global.h
9653<  
9654< -unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h global.h Makefile
9655< +unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h \
9656< +	global.h
9657<  
9658< -unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile
9659< +unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h \
9660< +	squashfs_compat.h global.h
9661<  
9662< -unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h global.h Makefile
9663< +unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h \
9664< +	global.h
9665<  
9666< -unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h global.h Makefile
9667< +unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h \
9668< +	global.h
9669<  
9670< +.PHONY: clean
9671<  clean:
9672<  	-rm -f *.o mksquashfs unsquashfs
9673<  
9674< +.PHONY: install
9675<  install: mksquashfs unsquashfs
9676<  	mkdir -p $(INSTALL_DIR)
9677<  	cp mksquashfs $(INSTALL_DIR)
9678< diff -Nur squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0-lzma-snapshot/squashfs-tools/mksquashfs.c
9679< --- squashfs4.0/squashfs-tools/mksquashfs.c	2009-04-05 23:22:48.000000000 +0200
9680< +++ squashfs4.0-lzma-snapshot/squashfs-tools/mksquashfs.c	2009-10-20 06:03:38.000000000 +0200
9681< @@ -36,7 +36,6 @@
9682<  #include <errno.h>
9683<  #include <dirent.h>
9684<  #include <string.h>
9685< -#include <zlib.h>
9686<  #include <stdlib.h>
9687<  #include <signal.h>
9688<  #include <setjmp.h>
9689< @@ -47,6 +46,7 @@
9690<  #include <math.h>
9691<  #include <regex.h>
9692<  #include <fnmatch.h>
9693< +#include <sys/wait.h>
9694<  
9695<  #ifndef linux
9696<  #define __BYTE_ORDER BYTE_ORDER
9697< @@ -64,6 +64,7 @@
9698---
9699> Index: squashfs4.0/squashfs-tools/mksquashfs.c
9700> ===================================================================
9701> --- squashfs4.0.orig/squashfs-tools/mksquashfs.c	2009-04-05 23:22:48.000000000 +0200
9702> +++ squashfs4.0/squashfs-tools/mksquashfs.c	2009-09-14 17:21:46.210480446 +0200
9703> @@ -64,6 +64,18 @@
9704420c9,20
9705< +#include "compressor.h"
9706---
9707> +#include "uncompress.h"
9708> +
9709> +#ifdef USE_LZMA
9710> +#include <LzmaEnc.h>
9711> +#include <LzmaDec.h>
9712> +#define LZMA_DEFAULT_LEVEL	5
9713> +#define LZMA_DEFAULT_DICT	0
9714> +#define LZMA_DEFAULT_LC	1
9715> +#define LZMA_DEFAULT_LP	2
9716> +#define LZMA_DEFAULT_PB 2
9717> +#define LZMA_DEFAULT_FB 32
9718> +#endif
9719424,454c24,25
9720< @@ -245,10 +246,8 @@
9721<  /* list of root directory entries read from original filesystem */
9722<  int old_root_entries = 0;
9723<  struct old_root_entry_info {
9724< -	char			name[SQUASHFS_NAME_LEN + 1];
9725< -	squashfs_inode		inode;
9726< -	int			type;
9727< -	int			inode_number;
9728< +	char			*name;
9729< +	struct inode_info	inode;
9730<  };
9731<  struct old_root_entry_info *old_root_entry;
9732<  
9733< @@ -371,10 +370,15 @@
9734<  int reader_buffer_size;
9735<  int fragment_buffer_size;
9736<  
9737< +/* compression operations structure */
9738< +static struct compressor *comp;
9739< +char *comp_name = COMP_DEFAULT;
9740< +
9741<  char *read_from_disk(long long start, unsigned int avail_bytes);
9742<  void add_old_root_entry(char *name, squashfs_inode inode, int inode_number,
9743<  	int type);
9744< -extern int read_super(int fd, squashfs_super_block *sBlk, char *source);
9745< +extern struct compressor  *read_super(int fd, squashfs_super_block *sBlk,
9746< +	char *source);
9747<  extern long long read_filesystem(char *root_name, int fd,
9748<  	squashfs_super_block *sBlk, char **cinode_table, char **data_cache,
9749<  	char **cdirectory_table, char **directory_data_cache,
9750< @@ -831,83 +835,32 @@
9751---
9752> @@ -830,6 +842,19 @@
9753>  	rotate = (rotate + 1) % 4;
9754456a28,40
9755> +#ifdef USE_LZMA
9756> +static void *lzma_malloc(void *p, size_t size)
9757> +{
9758> +	(void)p;
9759> +	return malloc(size);
9760> +}
9761> +static void lzma_free(void *p, void *addr)
9762> +{
9763> +	(void)p;
9764> +	free(addr);
9765> +}
9766> +static ISzAlloc lzma_alloc = { lzma_malloc, lzma_free };
9767> +#endif
9768458,459c42
9769< -unsigned int mangle2(z_stream **strm, char *d, char *s, int size,
9770< +int mangle2(void **strm, char *d, char *s, int size,
9771---
9772>  unsigned int mangle2(z_stream **strm, char *d, char *s, int size,
9773461,559c44,95
9774<  {
9775< -	unsigned long c_byte;
9776< -	unsigned int res;
9777< -	z_stream *stream = *strm;
9778< -
9779< -	if(uncompressed)
9780< -		goto notcompressed;
9781< -
9782< -	if(stream == NULL) {
9783< -		if((stream = *strm = malloc(sizeof(z_stream))) == NULL)
9784< -			BAD_ERROR("mangle::compress failed, not enough "
9785< -				"memory\n");
9786< -
9787< -		stream->zalloc = Z_NULL;
9788< -		stream->zfree = Z_NULL;
9789< -		stream->opaque = 0;
9790< -
9791< -		if((res = deflateInit(stream, 9)) != Z_OK) {
9792< -			if(res == Z_MEM_ERROR)
9793< -				BAD_ERROR("zlib::compress failed, not enough "
9794< -					"memory\n");
9795< -			else if(res == Z_STREAM_ERROR)
9796< -				BAD_ERROR("zlib::compress failed, not a valid "
9797< -					"compression level\n");
9798< -			else if(res == Z_VERSION_ERROR)
9799< -				BAD_ERROR("zlib::compress failed, incorrect "
9800< -					"zlib version\n");
9801< -			else
9802< -				BAD_ERROR("zlib::compress failed, unknown "
9803< -					"error %d\n", res);
9804< -		}
9805< -	} else if((res = deflateReset(stream)) != Z_OK) {
9806< -		if(res == Z_STREAM_ERROR)
9807< -			BAD_ERROR("zlib::compress failed, stream state "
9808< -				"inconsistent\n");
9809< -		else
9810< -			BAD_ERROR("zlib::compress failed, unknown error %d\n",
9811< -				res);
9812< -	}
9813< +	int error, c_byte = 0;
9814<  
9815< -	stream->next_in = (unsigned char *) s;
9816< -	stream->avail_in = size;
9817< -	stream->next_out = (unsigned char *) d;
9818< -	stream->avail_out = block_size;
9819< -
9820< -	res = deflate(stream, Z_FINISH);
9821< -	if(res != Z_STREAM_END && res != Z_OK) {
9822< -		if(res == Z_STREAM_ERROR)
9823< -			BAD_ERROR("zlib::compress failed, stream state "
9824< -				"inconsistent\n");
9825< -		else if(res == Z_BUF_ERROR)
9826< -			BAD_ERROR("zlib::compress failed, no progress possible"
9827< -				"\n");
9828< -		else
9829< -			BAD_ERROR("zlib::compress failed, unknown error %d\n",
9830< -				res);
9831< +	if(!uncompressed) {
9832< +		c_byte = comp->compress(strm, d, s, size, block_size, &error);
9833< +		if(c_byte == -1)
9834< +			BAD_ERROR("mangle2:: %s compress failed with error "
9835< +				"code %d\n", comp->name, error);
9836<  	}
9837<  
9838< -	c_byte = stream->total_out;
9839< -
9840< -	if(res != Z_STREAM_END || c_byte >= size) {
9841< -notcompressed:
9842< +	if(c_byte == 0 || c_byte >= size) {
9843<  		memcpy(d, s, size);
9844<  		return size | (data_block ? SQUASHFS_COMPRESSED_BIT_BLOCK :
9845<  			SQUASHFS_COMPRESSED_BIT);
9846<  	}
9847<  
9848< -	return (unsigned int) c_byte;
9849< +	return c_byte;
9850<  }
9851<  
9852<  
9853< -unsigned int mangle(char *d, char *s, int size, int block_size,
9854< +int mangle(char *d, char *s, int size, int block_size,
9855<  	int uncompressed, int data_block)
9856<  {
9857< -	static z_stream *stream = NULL;
9858< +	static void *stream = NULL;
9859<  
9860<  	return mangle2(&stream, d, s, size, block_size, uncompressed,
9861<  		data_block);
9862< @@ -1660,8 +1613,7 @@
9863<  	pthread_mutex_unlock(&fragment_mutex);
9864<  
9865<  	if(SQUASHFS_COMPRESSED_BLOCK(disk_fragment->size)) {
9866< -		int res;
9867< -		unsigned long bytes = block_size;
9868< +		int error, res;
9869<  		char *data;
9870<  
9871<  		if(compressed_buffer)
9872< @@ -1669,19 +1621,11 @@
9873---
9874> @@ -841,6 +866,50 @@
9875>  	if(uncompressed)
9876>  		goto notcompressed;
9877>  
9878> +#ifdef USE_LZMA
9879> +	if (compression == LZMA_COMPRESSION) {
9880> +		size_t outsize = block_size - LZMA_PROPS_SIZE;
9881> +		size_t propsize = LZMA_PROPS_SIZE;
9882> +		CLzmaEncProps props;
9883> +
9884> +		LzmaEncProps_Init(&props);
9885> +		props.level = LZMA_DEFAULT_LEVEL;
9886> +		props.dictSize = LZMA_DEFAULT_DICT;
9887> +		props.lc = LZMA_DEFAULT_LC;
9888> +		props.lp = LZMA_DEFAULT_LP;
9889> +		props.pb = LZMA_DEFAULT_PB;
9890> +		props.fb = LZMA_DEFAULT_FB;
9891> +		props.numThreads = 1;
9892> +
9893> +		res = LzmaEncode((unsigned char *) d + LZMA_PROPS_SIZE, &outsize,
9894> +			(unsigned char *) s, size,
9895> +			&props, (unsigned char *) d, &propsize,
9896> +			1, NULL, &lzma_alloc, &lzma_alloc);
9897> +		switch(res) {
9898> +		case SZ_OK:
9899> +			outsize += LZMA_PROPS_SIZE;
9900> +			break;
9901> +		case SZ_ERROR_DATA:
9902> +			BAD_ERROR("lzma::compress failed, data error\n");
9903> +			break;
9904> +		case SZ_ERROR_MEM:
9905> +			BAD_ERROR("lzma::compress failed, memory allocation error\n");
9906> +			break;
9907> +		case SZ_ERROR_PARAM:
9908> +			BAD_ERROR("lzma::compress failed, invalid parameters\n");
9909> +			break;
9910> +		case SZ_ERROR_OUTPUT_EOF:
9911> +			goto notcompressed;
9912> +		/* should not happen */
9913> +		default:
9914> +			BAD_ERROR("lzma::compress failed, unknown error (%d)\n", res);
9915> +			break;
9916> +		}
9917> +
9918> +		return outsize;
9919> +	}
9920> +#endif
9921> +
9922>  	if(stream == NULL) {
9923>  		if((stream = *strm = malloc(sizeof(z_stream))) == NULL)
9924>  			BAD_ERROR("mangle::compress failed, not enough "
9925> @@ -1669,17 +1738,17 @@
9926564,566c100,103
9927< -			(const unsigned char *) data, size);
9928< -		if(res != Z_OK) {
9929< -			if(res == Z_MEM_ERROR)
9930---
9931> +		res = uncompress_wrapper((unsigned char *) buffer->data, &bytes,
9932>  			(const unsigned char *) data, size);
9933>  		if(res != Z_OK) {
9934>  			if(res == Z_MEM_ERROR)
9935568,569c105,107
9936< -					"memory\n");
9937< -			else if(res == Z_BUF_ERROR)
9938---
9939> +				BAD_ERROR("uncompress failed, not enough "
9940>  					"memory\n");
9941>  			else if(res == Z_BUF_ERROR)
9942571,572c109,111
9943< -					"room in output buffer\n");
9944< -			else
9945---
9946> +				BAD_ERROR("uncompress failed, not enough "
9947>  					"room in output buffer\n");
9948>  			else
9949574,925c113,114
9950< -					"  unknown error %d\n", res);
9951< -		}
9952< +		res = comp->uncompress(buffer->data, data, size, block_size,
9953< +			&error);
9954< +		if(res == -1)
9955< +			BAD_ERROR("%s uncompress failed with error code %d\n",
9956< +				comp->name, error);
9957<  	} else if(compressed_buffer)
9958<  		memcpy(buffer->data, compressed_buffer->data, size);
9959<  	else
9960< @@ -1733,9 +1677,7 @@
9961<  		entry->buffer->block = bytes;
9962<  		bytes += compressed_size;
9963<  		fragments_outstanding --;
9964< -		pthread_mutex_unlock(&fragment_mutex);
9965<  		queue_put(to_writer, entry->buffer);
9966< -		pthread_mutex_lock(&fragment_mutex);
9967<  		TRACE("fragment_locked writing fragment %d, compressed size %d"
9968<  			"\n", entry->fragment, compressed_size);
9969<  		free(entry);
9970< @@ -1758,6 +1700,8 @@
9971<  	pthread_mutex_lock(&fragment_mutex);
9972<  	insert_fragment_list(&frag_locked_list, entry);
9973<  	pthread_mutex_unlock(&fragment_mutex);
9974< +
9975< +	return TRUE;
9976<  }
9977<  
9978<  
9979< @@ -1824,7 +1768,9 @@
9980<  	unsigned short c_byte;
9981<  	char cbuffer[(SQUASHFS_METADATA_SIZE << 2) + 2];
9982<  	
9983< +#ifdef SQUASHFS_TRACE
9984<  	long long obytes = bytes;
9985< +#endif
9986<  
9987<  	for(i = 0; i < meta_blocks; i++) {
9988<  		int avail_bytes = length > SQUASHFS_METADATA_SIZE ?
9989< @@ -2170,11 +2116,85 @@
9990<  }
9991<  
9992<  
9993< +static int seq = 0;
9994< +void reader_read_process(struct dir_ent *dir_ent)
9995< +{
9996< +	struct file_buffer *prev_buffer = NULL, *file_buffer;
9997< +	int status, res, byte, count = 0;
9998< +	int file = get_pseudo_file(dir_ent->inode->pseudo_id)->fd;
9999< +	int child = get_pseudo_file(dir_ent->inode->pseudo_id)->child;
10000< +	long long bytes = 0;
10001< +
10002< +	while(1) {
10003< +		file_buffer = cache_get(reader_buffer, 0, 0);
10004< +		file_buffer->sequence = seq ++;
10005< +
10006< +		byte = read_bytes(file, file_buffer->data, block_size);
10007< +		if(byte == -1)
10008< +			goto read_err;
10009< +
10010< +		file_buffer->size = byte;
10011< +		file_buffer->file_size = -1;
10012< +		file_buffer->block = count ++;
10013< +		file_buffer->error = FALSE;
10014< +		file_buffer->fragment = FALSE;
10015< +		bytes += byte;
10016< +
10017< +		if(byte == 0)
10018< +			break;
10019< +
10020< +		/*
10021< +		 * Update estimated_uncompressed block count.  This is done
10022< +		 * on every block rather than waiting for all blocks to be
10023< +		 * read incase write_file_process() is running in parallel
10024< +		 * with this.  Otherwise cur uncompressed block count may
10025< +		 * get ahead of the total uncompressed block count.
10026< +		 */ 
10027< +		estimated_uncompressed ++;
10028< +
10029< +		if(prev_buffer)
10030< +			queue_put(from_reader, prev_buffer);
10031< +		prev_buffer = file_buffer;
10032< +	}
10033< +
10034< +	/*
10035< + 	 * Update inode file size now that the size of the dynamic pseudo file
10036< +	 * is known.  This is needed for the -info option.
10037< +	 */
10038< +	dir_ent->inode->buf.st_size = bytes;
10039< +
10040< +	res = waitpid(child, &status, 0);
10041< +	if(res == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
10042< +		goto read_err;
10043< +
10044< +	if(prev_buffer == NULL)
10045< +		prev_buffer = file_buffer;
10046< +	else {
10047< +		cache_block_put(file_buffer);
10048< +		seq --;
10049< +	}
10050< +	prev_buffer->file_size = bytes;
10051< +	prev_buffer->fragment = !no_fragments &&
10052< +		(count == 2 || always_use_fragments) && (byte < block_size);
10053< +	queue_put(from_reader, prev_buffer);
10054< +
10055< +	return;
10056< +
10057< +read_err:
10058< +	if(prev_buffer) {
10059< +		cache_block_put(file_buffer);
10060< +		seq --;
10061< +		file_buffer = prev_buffer;
10062< +	}
10063< +	file_buffer->error = TRUE;
10064< +	queue_put(from_deflate, file_buffer);
10065< +}
10066< +
10067< +
10068<  void reader_read_file(struct dir_ent *dir_ent)
10069<  {
10070<  	struct stat *buf = &dir_ent->inode->buf, buf2;
10071<  	struct file_buffer *file_buffer;
10072< -	static int index = 0;
10073<  	int blocks, byte, count, expected, file, frag_block;
10074<  	long long bytes, read_size;
10075<  
10076< @@ -2202,7 +2222,7 @@
10077<  		if(file_buffer)
10078<  			queue_put(from_reader, file_buffer);
10079<  		file_buffer = cache_get(reader_buffer, 0, 0);
10080< -		file_buffer->sequence = index ++;
10081< +		file_buffer->sequence = seq ++;
10082<  
10083<  		byte = file_buffer->size = read_bytes(file, file_buffer->data,
10084<  			block_size);
10085< @@ -2238,7 +2258,7 @@
10086<  
10087<  read_err:
10088<  	file_buffer = cache_get(reader_buffer, 0, 0);
10089< -	file_buffer->sequence = index ++;
10090< +	file_buffer->sequence = seq ++;
10091<  read_err2:
10092<  	file_buffer->error = TRUE;
10093<  	queue_put(from_deflate, file_buffer);
10094< @@ -2262,9 +2282,14 @@
10095<  	for(i = 0; i < dir->count; i++) {
10096<  		struct dir_ent *dir_ent = dir->list[i];
10097<  		struct stat *buf = &dir_ent->inode->buf;
10098< -		if(dir_ent->data)
10099< +		if(dir_ent->inode->root_entry)
10100<  			continue;
10101<  
10102< +		if(dir_ent->inode->pseudo_file) {
10103< +			reader_read_process(dir_ent);
10104< +			continue;
10105< +		}
10106< +
10107<  		switch(buf->st_mode & S_IFMT) {
10108<  			case S_IFREG:
10109<  				reader_read_file(dir_ent);
10110< @@ -2365,7 +2390,7 @@
10111<  
10112<  void *deflator(void *arg)
10113<  {
10114< -	z_stream *stream = NULL;
10115< +	void *stream = NULL;
10116<  	int oldstate;
10117<  
10118<  	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
10119< @@ -2402,7 +2427,7 @@
10120<  
10121<  void *frag_deflator(void *arg)
10122<  {
10123< -	z_stream *stream = NULL;
10124< +	void *stream = NULL;
10125<  	int oldstate;
10126<  
10127<  	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
10128< @@ -2426,8 +2451,8 @@
10129<  			write_buffer->block = bytes;
10130<  			bytes += compressed_size;
10131<  			fragments_outstanding --;
10132< -			pthread_mutex_unlock(&fragment_mutex);
10133<  			queue_put(to_writer, write_buffer);
10134< +			pthread_mutex_unlock(&fragment_mutex);
10135<  			TRACE("Writing fragment %lld, uncompressed size %d, "
10136<  				"compressed size %d\n", file_buffer->block,
10137<  				file_buffer->size, compressed_size);
10138< @@ -2674,6 +2699,98 @@
10139<  }
10140<  
10141<  
10142< +int write_file_process(squashfs_inode *inode, struct dir_ent *dir_ent,
10143< +	struct file_buffer *read_buffer, int *duplicate_file)
10144< +{
10145< +	long long read_size, file_bytes, start;
10146< +	struct fragment *fragment;
10147< +	unsigned int *block_list = NULL;
10148< +	int block = 0, status;
10149< +	long long sparse = 0;
10150< +	struct file_buffer *fragment_buffer = NULL;
10151< +
10152< +	*duplicate_file = FALSE;
10153< +
10154< +	lock_fragments();
10155< +
10156< +	file_bytes = 0;
10157< +	start = bytes;
10158< +	while (1) {
10159< +		read_size = read_buffer->file_size;
10160< +		if(read_buffer->fragment && read_buffer->c_byte)
10161< +			fragment_buffer = read_buffer;
10162< +		else {
10163< +			block_list = realloc(block_list, (block + 1) *
10164< +				sizeof(unsigned int));
10165< +			if(block_list == NULL)
10166< +				BAD_ERROR("Out of memory allocating block_list"
10167< +					"\n");
10168< +			block_list[block ++] = read_buffer->c_byte;
10169< +			if(read_buffer->c_byte) {
10170< +				read_buffer->block = bytes;
10171< +				bytes += read_buffer->size;
10172< +				cache_rehash(read_buffer, read_buffer->block);
10173< +				file_bytes += read_buffer->size;
10174< +				queue_put(to_writer, read_buffer);
10175< +			} else {
10176< +				sparse += read_buffer->size;
10177< +				cache_block_put(read_buffer);
10178< +			}
10179< +		}
10180< +		inc_progress_bar();
10181< +
10182< +		if(read_size != -1)
10183< +			break;
10184< +
10185< +		read_buffer = get_file_buffer(from_deflate);
10186< +		if(read_buffer->error)
10187< +			goto read_err;
10188< +	}
10189< +
10190< +	unlock_fragments();
10191< +	fragment = get_and_fill_fragment(fragment_buffer);
10192< +	cache_block_put(fragment_buffer);
10193< +
10194< +	if(duplicate_checking)
10195< +		add_non_dup(read_size, file_bytes, block_list, start, fragment,
10196< +			0, 0, FALSE);
10197< +	file_count ++;
10198< +	total_bytes += read_size;
10199< +
10200< +	if(read_size < (1LL << 32) && start < (1LL << 32) && sparse == 0)
10201< +		create_inode(inode, dir_ent, SQUASHFS_FILE_TYPE, read_size,
10202< +			start, block, block_list, fragment, NULL, 0);
10203< +	else
10204< +		create_inode(inode, dir_ent, SQUASHFS_LREG_TYPE, read_size,
10205< +			start, block, block_list, fragment, NULL, sparse);
10206< +
10207< +	if(duplicate_checking == FALSE)
10208< +		free(block_list);
10209< +
10210< +	return 0;
10211< +
10212< +read_err:
10213< +	cur_uncompressed -= block;
10214< +	status = read_buffer->error;
10215< +	bytes = start;
10216< +	if(!block_device) {
10217< +		int res;
10218< +
10219< +		queue_put(to_writer, NULL);
10220< +		if(queue_get(from_writer) != 0)
10221< +			EXIT_MKSQUASHFS();
10222< +		res = ftruncate(fd, bytes);
10223< +		if(res != 0)
10224< +			BAD_ERROR("Failed to truncate dest file because %s\n",
10225< +				strerror(errno));
10226< +	}
10227< +	unlock_fragments();
10228< +	free(block_list);
10229< +	cache_block_put(read_buffer);
10230< +	return status;
10231< +}
10232< +
10233< +
10234<  int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent,
10235<  	long long read_size, struct file_buffer *read_buffer,
10236<  	int *duplicate_file)
10237< @@ -2941,7 +3058,10 @@
10238<  	
10239<  	read_size = read_buffer->file_size;
10240<  
10241< -	if(read_size == 0) {
10242< +	if(read_size == -1)
10243< +		status = write_file_process(inode, dir_ent, read_buffer,
10244< +			duplicate_file);
10245< +	else if(read_size == 0) {
10246<  		write_file_empty(inode, dir_ent, duplicate_file);
10247<  		cache_block_put(read_buffer);
10248<  	} else if(read_buffer->fragment && read_buffer->c_byte)
10249< @@ -3036,6 +3156,8 @@
10250<  
10251<  	memcpy(&inode->buf, buf, sizeof(struct stat));
10252<  	inode->read = FALSE;
10253< +	inode->root_entry = FALSE;
10254< +	inode->pseudo_file = FALSE;
10255<  	inode->inode = SQUASHFS_INVALID_BLK;
10256<  	inode->nlink = 1;
10257<  
10258< @@ -3056,7 +3178,7 @@
10259<  
10260<  
10261<  inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
10262< -	struct inode_info *inode_info, void *data, struct dir_info *dir)
10263< +	struct inode_info *inode_info, struct dir_info *dir)
10264<  {
10265<  	if((dir->count % DIR_ENTRIES) == 0) {
10266<  		dir->list = realloc(dir->list, (dir->count + DIR_ENTRIES) *
10267< @@ -3075,8 +3197,7 @@
10268<  		NULL;
10269<  	dir->list[dir->count]->inode = inode_info;
10270<  	dir->list[dir->count]->dir = sub_dir;
10271< -	dir->list[dir->count]->our_dir = dir;
10272< -	dir->list[dir->count++]->data = data;
10273< +	dir->list[dir->count++]->our_dir = dir;
10274<  	dir->byte_count += strlen(name) + sizeof(squashfs_dir_entry);
10275<  }
10276<  
10277< @@ -3128,10 +3249,10 @@
10278<  
10279<  	if(dir->count < old_root_entries)
10280<  		for(i = 0; i < old_root_entries; i++) {
10281< -			if(old_root_entry[i].type == SQUASHFS_DIR_TYPE)
10282< +			if(old_root_entry[i].inode.type == SQUASHFS_DIR_TYPE)
10283<  				dir->directory_count ++;
10284< -			add_dir_entry(old_root_entry[i].name, "", NULL, NULL,
10285< -				&old_root_entry[i], dir);
10286< +			add_dir_entry(old_root_entry[i].name, "", NULL,
10287< +				&old_root_entry[i].inode, dir);
10288<  		}
10289<  
10290<  	while(index < source) {
10291< @@ -3167,10 +3288,10 @@
10292<  
10293<  	if(dir->count < old_root_entries)
10294<  		for(i = 0; i < old_root_entries; i++) {
10295< -			if(old_root_entry[i].type == SQUASHFS_DIR_TYPE)
10296< +			if(old_root_entry[i].inode.type == SQUASHFS_DIR_TYPE)
10297<  				dir->directory_count ++;
10298< -			add_dir_entry(old_root_entry[i].name, "", NULL, NULL,
10299< -				&old_root_entry[i], dir);
10300< +			add_dir_entry(old_root_entry[i].name, "", NULL,
10301< +				&old_root_entry[i].inode, dir);
10302---
10303> +				BAD_ERROR("uncompress failed,"
10304>  					"  unknown error %d\n", res);
10305927,1112c116,117
10306<  
10307<  	if((d_name = readdir(dir->linuxdir)) != NULL) {
10308< @@ -3215,7 +3336,7 @@
10309<  	int current_count;
10310<  
10311<  	while((current_count = dir_info->current_count++) < dir_info->count)
10312< -		if(dir_info->list[current_count]->data)
10313< +		if(dir_info->list[current_count]->inode->root_entry)
10314<  			continue;
10315<  		else 
10316<  			return dir_info->list[current_count];
10317< @@ -3240,11 +3361,11 @@
10318<  	int current_count;
10319<  
10320<  	while((current_count = dir_info->current_count++) < dir_info->count)
10321< -		if(dir_info->list[current_count]->data)
10322< -			add_dir(dir_info->list[current_count]->data->inode,
10323< -				dir_info->list[current_count]->data->inode_number,
10324< +		if(dir_info->list[current_count]->inode->root_entry)
10325< +			add_dir(dir_info->list[current_count]->inode->inode,
10326< +				dir_info->list[current_count]->inode->inode_number,
10327<  				dir_info->list[current_count]->name,
10328< -				dir_info->list[current_count]->data->type, dir);
10329< +				dir_info->list[current_count]->inode->type, dir);
10330<  		else 
10331<  			return dir_info->list[current_count];
10332<  	return NULL;	
10333< @@ -3313,7 +3434,6 @@
10334<  	dir_ent->name = dir_ent->pathname = strdup(pathname);
10335<  	dir_ent->dir = dir_info;
10336<  	dir_ent->our_dir = NULL;
10337< -	dir_ent->data = NULL;
10338<  	dir_info->dir_ent = dir_ent;
10339<  
10340<  	if(sorted)
10341< @@ -3383,7 +3503,7 @@
10342<  			sub_dir = NULL;
10343<  
10344<  		add_dir_entry(dir_name, filename, sub_dir, lookup_inode(&buf),
10345< -			NULL, dir);
10346< +			dir);
10347<  	}
10348<  
10349<  	scan1_freedir(dir);
10350< @@ -3399,7 +3519,7 @@
10351<  	struct dir_ent *dir_ent;
10352<  	struct pseudo_entry *pseudo_ent;
10353<  	struct stat buf;
10354< -	static pseudo_ino = 1;
10355< +	static int pseudo_ino = 1;
10356<  	
10357<  	if(dir == NULL && (dir = scan1_opendir("")) == NULL)
10358<  		return NULL;
10359< @@ -3415,6 +3535,29 @@
10360<  
10361<  	while((pseudo_ent = pseudo_readdir(pseudo)) != NULL) {
10362<  		dir_ent = scan2_lookup(dir, pseudo_ent->name);
10363< +		if(pseudo_ent->dev->type == 's') {
10364< +			struct stat *buf;
10365< +			if(dir_ent == NULL) {
10366< +				ERROR("Pseudo set file \"%s\" does not exist "
10367< +					"in source filesystem.  Ignoring\n",
10368< +					pseudo_ent->pathname);
10369< +				continue;
10370< +			}
10371< +			if(dir_ent->inode->root_entry) {
10372< +				ERROR("Pseudo set file \"%s\" is a pre-existing"
10373< +					" file in the filesystem being appended"
10374< +					"  to.  It cannot be modified. "
10375< +					"Ignoring!\n", pseudo_ent->pathname);
10376< +				continue;
10377< +			}
10378< +			buf = &dir_ent->inode->buf;
10379< +			buf->st_mode = (buf->st_mode & S_IFMT) |
10380< +				pseudo_ent->dev->mode;
10381< +			buf->st_uid = pseudo_ent->dev->uid;
10382< +			buf->st_gid = pseudo_ent->dev->gid;
10383< +			continue;
10384< +		}
10385< +
10386<  		if(dir_ent) {
10387<  			ERROR("Pseudo file \"%s\" exists in source filesystem "
10388<  				"\"%s\"\n", pseudo_ent->pathname,
10389< @@ -3444,8 +3587,29 @@
10390<  		buf.st_mtime = time(NULL);
10391<  		buf.st_ino = pseudo_ino ++;
10392<  
10393< -		add_dir_entry(pseudo_ent->name, pseudo_ent->pathname, sub_dir,
10394< -			lookup_inode(&buf), NULL, dir);
10395< +		if(pseudo_ent->dev->type == 'f') {
10396< +#ifdef USE_TMP_FILE
10397< +			struct stat buf2;
10398< +			int res = stat(pseudo_ent->dev->filename, &buf2);
10399< +			if(res == -1) {
10400< +				ERROR("Stat on pseudo file \"%s\" failed, "
10401< +					"skipping...", pseudo_ent->pathname);
10402< +				continue;
10403< +			}
10404< +			buf.st_size = buf2.st_size;
10405< +			add_dir_entry(pseudo_ent->name,
10406< +				pseudo_ent->dev->filename, sub_dir,
10407< +				lookup_inode(&buf), dir);
10408< +#else
10409< +			struct inode_info *inode = lookup_inode(&buf);
10410< +			inode->pseudo_id = pseudo_ent->dev->pseudo_id;
10411< +			inode->pseudo_file = TRUE;		
10412< +			add_dir_entry(pseudo_ent->name, pseudo_ent->pathname,
10413< +				sub_dir, inode, dir);
10414< +#endif
10415< +		} else
10416< +			add_dir_entry(pseudo_ent->name, pseudo_ent->pathname,
10417< +				sub_dir, lookup_inode(&buf), dir);
10418<  	}
10419<  
10420<  	scan2_freedir(dir);
10421< @@ -3482,8 +3646,9 @@
10422<  						&duplicate_file);
10423<  					INFO("file %s, uncompressed size %lld "
10424<  						"bytes %s\n", filename,
10425< -						buf->st_size, duplicate_file ?
10426< -						"DUPLICATE" : "");
10427< +						(long long) buf->st_size,
10428< +						duplicate_file ?  "DUPLICATE" :
10429< +						 "");
10430<  					break;
10431<  
10432<  				case S_IFDIR:
10433< @@ -3557,6 +3722,7 @@
10434<  						INFO("file %s, uncompressed "
10435<  							"size %lld bytes LINK"
10436<  							"\n", filename,
10437< +							(long long)
10438<  							buf->st_size);
10439<  					break;
10440<  				case SQUASHFS_SYMLINK_TYPE:
10441< @@ -3667,10 +3833,11 @@
10442<  		BAD_ERROR("Out of memory in old root directory entries "
10443<  			"reallocation\n");
10444<  
10445< -	strcpy(old_root_entry[old_root_entries].name, name);
10446< -	old_root_entry[old_root_entries].inode = inode;
10447< -	old_root_entry[old_root_entries].inode_number = inode_number;
10448< -	old_root_entry[old_root_entries++].type = type;
10449< +	old_root_entry[old_root_entries].name = strdup(name);
10450< +	old_root_entry[old_root_entries].inode.inode = inode;
10451< +	old_root_entry[old_root_entries].inode.inode_number = inode_number;
10452< +	old_root_entry[old_root_entries].inode.type = type;
10453< +	old_root_entry[old_root_entries++].inode.root_entry = TRUE;
10454<  }
10455<  
10456<  
10457< @@ -4137,7 +4304,7 @@
10458<  
10459<  
10460<  #define VERSION() \
10461< -	printf("mksquashfs version 4.0 (2009/04/05)\n");\
10462< +	printf("mksquashfs version 4.1-CVS (2009/09/20)\n");\
10463<  	printf("copyright (C) 2009 Phillip Lougher <phillip@lougher.demon.co.uk>\n\n"); \
10464<  	printf("This program is free software; you can redistribute it and/or\n");\
10465<  	printf("modify it under the terms of the GNU General Public License\n");\
10466< @@ -4172,26 +4339,28 @@
10467<  	source_path = argv + 1;
10468<  	source = i - 2;
10469<  	for(; i < argc; i++) {
10470< -		if(strcmp(argv[i], "-pf") == 0) {
10471< +		if(strcmp(argv[i], "-comp") == 0) {
10472<  			if(++i == argc) {
10473< -				ERROR("%s: -pf missing filename\n", argv[0]);
10474< +				ERROR("%s: -comp missing compression type\n",
10475< +					argv[0]);
10476<  				exit(1);
10477<  			}
10478< -			if(read_pseudo_file(&pseudo, argv[i]) == FALSE) {
10479< -				ERROR("Failed to parse pseudo file \"%s\"\n",
10480< -					argv[i]);
10481< +			comp_name = argv[i];
10482< +		} else if(strcmp(argv[i], "-pf") == 0) {
10483< +			if(++i == argc) {
10484< +				ERROR("%s: -pf missing filename\n", argv[0]);
10485<  				exit(1);
10486<  			}
10487< +			if(read_pseudo_file(&pseudo, argv[i]) == FALSE)
10488< +				exit(1);
10489<  		} else if(strcmp(argv[i], "-p") == 0) {
10490<  			if(++i == argc) {
10491<  				ERROR("%s: -p missing pseudo file definition\n",
10492---
10493>  	} else if(compressed_buffer)
10494> @@ -4282,6 +4351,10 @@
104951116,1121c121,125
10496< -			if(read_pseudo_def(&pseudo, argv[i]) == FALSE) {
10497< -				ERROR("Failed to parse pseudo definition\n");
10498< +			if(read_pseudo_def(&pseudo, argv[i]) == FALSE)
10499<  				exit(1);
10500< -			}
10501<  		} else if(strcmp(argv[i], "-recover") == 0) {
10502---
10503> +#ifdef USE_LZMA
10504> +		} else if(strcmp(argv[i], "-lzma") == 0) {
10505> +			compression = LZMA_COMPRESSION;
10506> +#endif
10507>  		} else if(strcmp(argv[i], "-ef") == 0) {
105081123,1144c127,128
10509<  				ERROR("%s: -recover missing recovery file\n",
10510< @@ -4394,34 +4563,16 @@
10511<  printOptions:
10512<  			ERROR("SYNTAX:%s source1 source2 ...  dest [options] "
10513<  				"[-e list of exclude\ndirs/files]\n", argv[0]);
10514< -			ERROR("\nOptions are\n");
10515< -			ERROR("-version\t\tprint version, licence and "
10516< -				"copyright message\n");
10517< -			ERROR("-recover <name>\t\trecover filesystem data "
10518< -				"using recovery file <name>\n");
10519< -			ERROR("-no-recovery\t\tdon't generate a recovery "
10520< -				"file\n");
10521< -			ERROR("-info\t\t\tprint files written to filesystem\n");
10522< -			ERROR("-no-exports\t\tdon't make the filesystem "
10523< -				"exportable via NFS\n");
10524< -			ERROR("-no-progress\t\tdon't display the progress "
10525< -				"bar\n");
10526< -			ERROR("-no-sparse\t\tdon't detect sparse files\n");
10527< +			ERROR("\nFilesystem build options:\n");
10528< +			ERROR("-comp <comp>\t\tselect <comp> compression\n");
10529< +			ERROR("\t\t\tCompressors available:\n");
10530< +			display_compressors("\t\t\t", COMP_DEFAULT);
10531---
10532>  				ERROR("%s: -ef missing filename\n", argv[0]);
10533> @@ -4410,6 +4483,9 @@
105341148,1325c132,138
10535< -			ERROR("-processors <number>\tUse <number> processors."
10536< -				"  By default will use number of\n");
10537< -			ERROR("\t\t\tprocessors available\n");
10538< -			ERROR("-read-queue <size>\tSet input queue to <size> "
10539< -				"Mbytes.  Default %d Mbytes\n",
10540< -				READER_BUFFER_DEFAULT);
10541< -			ERROR("-write-queue <size>\tSet output queue to <size> "
10542< -				"Mbytes.  Default %d Mbytes\n",
10543< -				WRITER_BUFFER_DEFAULT);
10544< -			ERROR("-fragment-queue <size>\tSet fagment queue to "
10545< -				"<size> Mbytes.  Default %d Mbytes\n",
10546< -				FRAGMENT_BUFFER_DEFAULT);
10547< +			ERROR("-no-exports\t\tdon't make the filesystem "
10548< +				"exportable via NFS\n");
10549< +			ERROR("-no-sparse\t\tdon't detect sparse files\n");
10550<  			ERROR("-noI\t\t\tdo not compress inode table\n");
10551<  			ERROR("-noD\t\t\tdo not compress data blocks\n");
10552<  			ERROR("-noF\t\t\tdo not compress fragment blocks\n");
10553< @@ -4430,13 +4581,34 @@
10554<  				"files larger than block size\n");
10555<  			ERROR("-no-duplicates\t\tdo not perform duplicate "
10556<  				"checking\n");
10557< -			ERROR("-noappend\t\tdo not append to existing "
10558< -				"filesystem\n");
10559< +			ERROR("-all-root\t\tmake all files owned by root\n");
10560< +			ERROR("-force-uid uid\t\tset all file uids to uid\n");
10561< +			ERROR("-force-gid gid\t\tset all file gids to gid\n");
10562< +			ERROR("-nopad\t\t\tdo not pad filesystem to a multiple "
10563< +				"of 4K\n");
10564<  			ERROR("-keep-as-directory\tif one source directory is "
10565<  				"specified, create a root\n");
10566<  			ERROR("\t\t\tdirectory containing that directory, "
10567<  				"rather than the\n");
10568<  			ERROR("\t\t\tcontents of the directory\n");
10569< +			ERROR("\nFilesystem filter options:\n");
10570< +			ERROR("-p <pseudo-definition>\tAdd pseudo file definition\n");
10571< +			ERROR("-pf <pseudo-file>\tAdd list of pseudo file definitions\n");
10572< +			ERROR("-sort <sort_file>\tsort files according to "
10573< +				"priorities in <sort_file>.  One\n");
10574< +			ERROR("\t\t\tfile or dir with priority per line.  "
10575< +				"Priority -32768 to\n");
10576< +			ERROR("\t\t\t32767, default priority 0\n");
10577< +			ERROR("-ef <exclude_file>\tlist of exclude dirs/files."
10578< +				"  One per line\n");
10579< +			ERROR("-wildcards\t\tAllow extended shell wildcards "
10580< +				"(globbing) to be used in\n\t\t\texclude "
10581< +				"dirs/files\n");
10582< +			ERROR("-regex\t\t\tAllow POSIX regular expressions to "
10583< +				"be used in exclude\n\t\t\tdirs/files\n");
10584< +			ERROR("\nFilesystem append options:\n");
10585< +			ERROR("-noappend\t\tdo not append to existing "
10586< +				"filesystem\n");
10587<  			ERROR("-root-becomes <name>\twhen appending source "
10588<  				"files/directories, make the\n");
10589<  			ERROR("\t\t\toriginal root become a subdirectory in "
10590< @@ -4444,11 +4616,29 @@
10591<  			ERROR("\t\t\tcalled <name>, rather than adding the new "
10592<  				"source items\n");
10593<  			ERROR("\t\t\tto the original root\n");
10594< -			ERROR("-all-root\t\tmake all files owned by root\n");
10595< -			ERROR("-force-uid uid\t\tset all file uids to uid\n");
10596< -			ERROR("-force-gid gid\t\tset all file gids to gid\n");
10597< -			ERROR("-nopad\t\t\tdo not pad filesystem to a multiple "
10598< -				"of 4K\n");
10599< +			ERROR("\nMksquashfs runtime options:\n");
10600< +			ERROR("-version\t\tprint version, licence and "
10601< +				"copyright message\n");
10602< +			ERROR("-recover <name>\t\trecover filesystem data "
10603< +				"using recovery file <name>\n");
10604< +			ERROR("-no-recovery\t\tdon't generate a recovery "
10605< +				"file\n");
10606< +			ERROR("-info\t\t\tprint files written to filesystem\n");
10607< +			ERROR("-no-progress\t\tdon't display the progress "
10608< +				"bar\n");
10609< +			ERROR("-processors <number>\tUse <number> processors."
10610< +				"  By default will use number of\n");
10611< +			ERROR("\t\t\tprocessors available\n");
10612< +			ERROR("-read-queue <size>\tSet input queue to <size> "
10613< +				"Mbytes.  Default %d Mbytes\n",
10614< +				READER_BUFFER_DEFAULT);
10615< +			ERROR("-write-queue <size>\tSet output queue to <size> "
10616< +				"Mbytes.  Default %d Mbytes\n",
10617< +				WRITER_BUFFER_DEFAULT);
10618< +			ERROR("-fragment-queue <size>\tSet fagment queue to "
10619< +				"<size> Mbytes.  Default %d Mbytes\n",
10620< +				FRAGMENT_BUFFER_DEFAULT);
10621< +			ERROR("\nMiscellaneous options:\n");
10622<  			ERROR("-root-owned\t\talternative name for -all-root"
10623<  				"\n");
10624<  			ERROR("-noInodeCompression\talternative name for -noI"
10625< @@ -4457,20 +4647,6 @@
10626<  				"\n");
10627<  			ERROR("-noFragmentCompression\talternative name for "
10628<  				"-noF\n");
10629< -			ERROR("-sort <sort_file>\tsort files according to "
10630< -				"priorities in <sort_file>.  One\n");
10631< -			ERROR("\t\t\tfile or dir with priority per line.  "
10632< -				"Priority -32768 to\n");
10633< -			ERROR("\t\t\t32767, default priority 0\n");
10634< -			ERROR("-ef <exclude_file>\tlist of exclude dirs/files."
10635< -				"  One per line\n");
10636< -			ERROR("-wildcards\t\tAllow extended shell wildcards "
10637< -				"(globbing) to be used in\n\t\t\texclude "
10638< -				"dirs/files\n");
10639< -			ERROR("-regex\t\t\tAllow POSIX regular expressions to "
10640< -				"be used in exclude\n\t\t\tdirs/files\n");
10641< -			ERROR("-p <pseudo-definition>\tAdd pseudo file definition\n");
10642< -			ERROR("-pf <pseudo-file>\tAdd list of pseudo file definitions\n");
10643<  			exit(1);
10644<  		}
10645<  	}
10646< @@ -4548,11 +4724,10 @@
10647<  			fclose(fd);
10648<  		} else if(strcmp(argv[i], "-e") == 0)
10649<  			break;
10650< -		else if(strcmp(argv[i], "-b") == 0 ||
10651< -				strcmp(argv[i], "-root-becomes") == 0 ||
10652< +		else if(strcmp(argv[i], "-root-becomes") == 0 ||
10653<  				strcmp(argv[i], "-sort") == 0 ||
10654<  				strcmp(argv[i], "-pf") == 0 ||
10655< -				strcmp(argv[i], "-p") == 0)
10656< +				strcmp(argv[i], "-comp") == 0)
10657<  			i++;
10658<  
10659<  	if(i != argc) {
10660< @@ -4574,11 +4749,10 @@
10661<  			sorted ++;
10662<  		} else if(strcmp(argv[i], "-e") == 0)
10663<  			break;
10664< -		else if(strcmp(argv[i], "-b") == 0 ||
10665< -				strcmp(argv[i], "-root-becomes") == 0 ||
10666< +		else if(strcmp(argv[i], "-root-becomes") == 0 ||
10667<  				strcmp(argv[i], "-ef") == 0 ||
10668<  				strcmp(argv[i], "-pf") == 0 ||
10669< -				strcmp(argv[i], "-p") == 0)
10670< +				strcmp(argv[i], "-comp") == 0)
10671<  			i++;
10672<  
10673<  #ifdef SQUASHFS_TRACE
10674< @@ -4586,7 +4760,8 @@
10675<  #endif
10676<  
10677<  	if(!delete) {
10678< -	        if(read_super(fd, &sBlk, argv[source + 1]) == 0) {
10679< +	        comp = read_super(fd, &sBlk, argv[source + 1]);
10680< +	        if(comp == NULL) {
10681<  			ERROR("Failed to read existing filesystem - will not "
10682<  				"overwrite - ABORTING!\n");
10683<  			ERROR("To force Mksquashfs to write to this block "
10684< @@ -4603,6 +4778,15 @@
10685<  		always_use_fragments = SQUASHFS_ALWAYS_FRAGMENTS(sBlk.flags);
10686<  		duplicate_checking = SQUASHFS_DUPLICATES(sBlk.flags);
10687<  		exportable = SQUASHFS_EXPORTABLE(sBlk.flags);
10688< +	} else {
10689< +		comp = lookup_compressor(comp_name);
10690< +		if(!comp->supported) {
10691< +			ERROR("FATAL_ERROR: Compressor \"%s\" is not "
10692< +				"supported!\n", comp_name);
10693< +			ERROR("Compressors available:\n");
10694< +			display_compressors("", COMP_DEFAULT);
10695< +			EXIT_MKSQUASHFS();
10696< +		}
10697<  	}
10698<  
10699<  	initialise_threads();
10700< @@ -4648,8 +4832,8 @@
10701<  			"size %d\n", SQUASHFS_MAJOR, s_minor, argv[source + 1],
10702<  			block_size);
10703<  		printf("All -b, -noI, -noD, -noF, no-duplicates, no-fragments, "
10704< -			"-always-use-fragments and -exportable options ignored"
10705< -			"\n");
10706< +			"-always-use-fragments,\n-exportable and -comp options "
10707< +			"ignored\n");
10708<  		printf("\nIf appending is not wanted, please re-run with "
10709<  			"-noappend specified!\n\n");
10710<  
10711< @@ -4803,8 +4987,7 @@
10712<  
10713---
10714> +#ifdef USE_LZMA
10715> +			ERROR("-lzma Enable LZMA compression\n");
10716> +#endif
10717>  			ERROR("-processors <number>\tUse <number> processors."
10718>  				"  By default will use number of\n");
10719>  			ERROR("\t\t\tprocessors available\n");
10720> @@ -4804,7 +4880,7 @@
107211328c141
10722< -	/* Only compression supported */
10723---
10724>  	/* Only compression supported */
107251330c143
10726< +	sBlk.compression = comp->id;
10727---
10728> +	sBlk.compression = compression;
107291334c147,152
10730< @@ -4820,6 +5003,8 @@
10731---
10732> Index: squashfs4.0/squashfs-tools/squashfs_fs.h
10733> ===================================================================
10734> --- squashfs4.0.orig/squashfs-tools/squashfs_fs.h	2009-03-18 03:50:20.000000000 +0100
10735> +++ squashfs4.0/squashfs-tools/squashfs_fs.h	2009-09-14 17:20:36.310480350 +0200
10736> @@ -229,6 +229,7 @@
10737>  typedef long long		squashfs_inode_t;
107381336c154,155
10739<  	close(fd);
10740---
10741>  #define ZLIB_COMPRESSION	1
10742> +#define LZMA_COMPRESSION	2
107431338c157,171
10744< +	delete_pseudo_files();
10745---
10746>  struct squashfs_super_block {
10747>  	unsigned int		s_magic;
10748> Index: squashfs4.0/squashfs-tools/Makefile
10749> ===================================================================
10750> --- squashfs4.0.orig/squashfs-tools/Makefile	2009-04-05 04:03:36.000000000 +0200
10751> +++ squashfs4.0/squashfs-tools/Makefile	2009-09-14 17:20:36.310480350 +0200
10752> @@ -4,14 +4,20 @@
10753>  
10754>  CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2
10755>  
10756> +ifdef USE_LZMA
10757> +  LZMA_CFLAGS = -DUSE_LZMA
10758> +  LZMA_LIB = -llzma
10759> +  CFLAGS += $(LZMA_CFLAGS)
10760> +endif
107611340,1363c173
10762<  	if(recovery_file[0] != '\0')
10763<  		unlink(recovery_file);
10764<  
10765< @@ -4827,9 +5012,9 @@
10766<  		* sizeof(unsigned short) + guid_count * sizeof(unsigned short) +
10767<  		sizeof(squashfs_super_block);
10768<  
10769< -	printf("\n%sSquashfs %d.%d filesystem, data block size %d\n",
10770< -		exportable ? "Exportable " : "", SQUASHFS_MAJOR, SQUASHFS_MINOR,
10771< -		block_size);
10772< +	printf("\n%sSquashfs %d.%d filesystem, %s compressed, data block size"
10773< +		" %d\n", exportable ? "Exportable " : "", SQUASHFS_MAJOR,
10774< +		SQUASHFS_MINOR, comp->name, block_size);
10775<  	printf("\t%s data, %s metadata, %s fragments\n",
10776<  		noD ? "uncompressed" : "compressed", noI ?  "uncompressed" :
10777<  		"compressed", no_fragments ? "no" : noF ? "uncompressed" :
10778< diff -Nur squashfs4.0/squashfs-tools/pseudo.c squashfs4.0-lzma-snapshot/squashfs-tools/pseudo.c
10779< --- squashfs4.0/squashfs-tools/pseudo.c	2009-04-05 04:01:58.000000000 +0200
10780< +++ squashfs4.0-lzma-snapshot/squashfs-tools/pseudo.c	2009-10-20 06:03:38.000000000 +0200
10781< @@ -30,6 +30,7 @@
10782<  #include <string.h>
10783<  #include <stdlib.h>
10784<  #include <sys/types.h>
10785< +#include <sys/wait.h>
10786---
10787>  all: mksquashfs unsquashfs
107881365c175,178
10789<  #include "pseudo.h"
10790---
10791> -mksquashfs: mksquashfs.o read_fs.o sort.o swap.o pseudo.o
10792> -	$(CC) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@
10793> +mksquashfs: mksquashfs.o read_fs.o sort.o swap.o pseudo.o uncompress.o
10794> +	$(CC) mksquashfs.o read_fs.o sort.o swap.o pseudo.o uncompress.o -lz -lpthread -lm $(LZMA_LIB) -o $@
107951367,1418c180,181
10796< @@ -55,6 +56,9 @@
10797<  #define TRUE 1
10798<  #define FALSE 0
10799<  
10800< +struct pseudo_dev **pseudo_file = NULL;
10801< +int pseudo_count = 0;
10802< +
10803<  static void dump_pseudo(struct pseudo *pseudo, char *string)
10804<  {
10805<  	int i;
10806< @@ -99,7 +103,7 @@
10807<  	char *target, char *alltarget)
10808<  {
10809<  	char targname[1024];
10810< -	int i, error;
10811< +	int i;
10812<  
10813<  	target = get_component(target, targname);
10814<  
10815< @@ -128,12 +132,8 @@
10816<  		if(target[0] == '\0') {
10817<  			/* at leaf pathname component */
10818<  			pseudo->name[i].pseudo = NULL;
10819< -			pseudo->name[i].dev = malloc(sizeof(struct pseudo_dev));
10820< -			if(pseudo->name[i].dev == NULL)
10821< -				BAD_ERROR("failed to allocate pseudo file\n");
10822<  			pseudo->name[i].pathname = strdup(alltarget);
10823< -			memcpy(pseudo->name[i].dev, pseudo_dev,
10824< -				sizeof(struct pseudo_dev));
10825< +			pseudo->name[i].dev = pseudo_dev;
10826<  		} else {
10827<  			/* recurse adding child components */
10828<  			pseudo->name[i].dev = NULL;
10829< @@ -169,15 +169,9 @@
10830<  			if(target[0] == '\0') {
10831<  				if(pseudo->name[i].dev == NULL &&
10832<  						pseudo_dev->type == 'd') {
10833< -					pseudo->name[i].dev =
10834< -						malloc(sizeof(struct pseudo_dev));
10835< -					if(pseudo->name[i].dev == NULL)
10836< -						BAD_ERROR("failed to allocate "
10837< -							"pseudo file\n");
10838<  					pseudo->name[i].pathname =
10839<  						strdup(alltarget);
10840< -					memcpy(pseudo->name[i].dev, pseudo_dev,
10841< -						sizeof(struct pseudo_dev));
10842< +					pseudo->name[i].dev = pseudo_dev;
10843<  				} else
10844<  					ERROR("%s already exists as a "
10845<  						"directory.  Ignoring %s!\n",
10846< @@ -229,16 +223,113 @@
10847<  }
10848---
10849> -mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h squashfs_swap.h Makefile
10850> +mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h squashfs_swap.h uncompress.h Makefile
108511419a183,184
10852> -read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h Makefile
10853> +read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h uncompress.h Makefile
108541421,1548c186
10855< +int exec_file(char *command, struct pseudo_dev *dev)
10856< +{
10857< +	int child, res;
10858< +	static pid_t pid = -1;
10859< +	int pipefd[2];
10860< +#ifdef USE_TMP_FILE
10861< +	char filename[1024];
10862< +	int status;
10863< +	static int number = 0;
10864< +#endif
10865< +
10866< +	if(pid == -1)
10867< +		pid = getpid();
10868< +
10869< +#ifdef USE_TMP_FILE
10870< +	sprintf(filename, "/tmp/squashfs_pseudo_%d_%d", pid, number ++);
10871< +	pipefd[1] = open(filename, O_CREAT | O_TRUNC | O_RDWR, S_IRWXU);
10872< +	if(pipefd[1] == -1) {
10873< +		printf("open failed\n");
10874< +		return -1;
10875< +	}
10876< +#else
10877< +	res = pipe(pipefd);
10878< +	if(res == -1) {
10879< +		printf("pipe failed\n");
10880< +		return -1;
10881< +	}
10882< +#endif
10883< +
10884< +	child = fork();
10885< +	if(child == -1) {
10886< +		printf("fork failed\n");
10887< +		goto failed;
10888< +	}
10889< +
10890< +	if(child == 0) {
10891< +		close(STDOUT_FILENO);
10892< +		res = dup(pipefd[1]);
10893< +		if(res == -1) {
10894< +			printf("dup failed\n");
10895< +			exit(EXIT_FAILURE);
10896< +		}
10897< +		execl("/bin/sh", "sh", "-c", command, (char *) NULL);
10898< +		printf("execl failed\n");
10899< +		exit(EXIT_FAILURE);
10900< +	}
10901< +
10902< +#ifdef USE_TMP_FILE
10903< +	res = waitpid(child, &status, 0);
10904< +	close(pipefd[1]);
10905< +	if(res != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0) {
10906< +		dev->filename = strdup(filename);
10907< +		return 0;
10908< +	}
10909< +failed:
10910< +	unlink(filename);
10911< +	return -1;
10912< +#else
10913< +	close(pipefd[1]);
10914< +	dev->fd = pipefd[0];
10915< +	dev->child = child;
10916< +	return 0;
10917< +failed:
10918< +	return -1;
10919< +#endif
10920< +}
10921< +
10922< +
10923< +void add_pseudo_file(struct pseudo_dev *dev)
10924< +{
10925< +	pseudo_file = realloc(pseudo_file, (pseudo_count + 1) *
10926< +		sizeof(struct pseudo_dev *));
10927< +	if(pseudo_file == NULL)
10928< +		BAD_ERROR("Failed to realloc pseudo_file\n");
10929< +
10930< +	dev->pseudo_id = pseudo_count;
10931< +	pseudo_file[pseudo_count ++] = dev;
10932< +}
10933< +
10934< +
10935< +void delete_pseudo_files()
10936< +{
10937< +#ifdef USE_TMP_FILE
10938< +	int i;
10939< +
10940< +	for(i = 0; i < pseudo_count; i++)
10941< +		unlink(pseudo_file[i]->filename);
10942< +#endif
10943< +}
10944< +
10945< +
10946< +struct pseudo_dev *get_pseudo_file(int pseudo_id)
10947< +{
10948< +	return pseudo_file[pseudo_id];
10949< +}
10950< +
10951< +
10952<  int read_pseudo_def(struct pseudo **pseudo, char *def)
10953<  {
10954< -	int n;
10955< +	int n, bytes;
10956<  	unsigned int major = 0, minor = 0, mode;
10957<  	char filename[2048], type, suid[100], sgid[100], *ptr;
10958<  	long long uid, gid;
10959< -	struct pseudo_dev dev;
10960< +	struct pseudo_dev *dev;
10961<  
10962< -	n = sscanf(def, "%s %c %o %s %s %u %u", filename, &type, &mode, suid, sgid,
10963< -			&major, &minor);
10964< +	n = sscanf(def, "%s %c %o %s %s %n", filename, &type, &mode, suid,
10965< +			sgid, &bytes);
10966<  
10967<  	if(n < 5) {
10968<  		ERROR("Not enough or invalid arguments in pseudo file "
10969< @@ -249,7 +340,9 @@
10970<  	switch(type) {
10971<  	case 'b':
10972<  	case 'c':
10973< -		if(n < 7) {
10974< +		n = sscanf(def + bytes,  "%u %u", &major, &minor);
10975< +
10976< +		if(n < 2) {
10977<  			ERROR("Not enough or invalid arguments in pseudo file "
10978<  				"definition\n");
10979<  			goto error;
10980< @@ -265,47 +358,15 @@
10981<  			goto error;
10982<  		}
10983---
10984>  sort.o: sort.c squashfs_fs.h global.h sort.h Makefile
109851550,1603c188
10986< -		/* fall through */
10987< -	case 'd':
10988< -		if(mode > 0777) {
10989< -			ERROR("Mode %o out of range\n", mode);
10990< +	case 'f':
10991< +		if(def[bytes] == '\0') {
10992< +			ERROR("Not enough arguments in pseudo file "
10993< +				"definition\n");
10994<  			goto error;
10995< -		}
10996< -
10997< -		uid = strtoll(suid, &ptr, 10);
10998< -		if(*ptr == '\0') {
10999< -			if(uid < 0 || uid > ((1LL << 32) - 1)) {
11000< -				ERROR("Uid %s out of range\n", suid);
11001< -				goto error;
11002< -			}
11003< -		} else {
11004< -			struct passwd *pwuid = getpwnam(suid);
11005< -			if(pwuid)
11006< -				uid = pwuid->pw_uid;
11007< -			else {
11008< -				ERROR("Uid %s invalid uid or unknown user\n",
11009< -					suid);
11010< -				goto error;
11011< -			}
11012< -		}
11013< -		
11014< -		gid = strtoll(sgid, &ptr, 10);
11015< -		if(*ptr == '\0') {
11016< -			if(gid < 0 || gid > ((1LL << 32) - 1)) {
11017< -				ERROR("Gid %s out of range\n", sgid);
11018< -				goto error;
11019< -			}
11020< -		} else {
11021< -			struct group *grgid = getgrnam(sgid);
11022< -			if(grgid)
11023< -				gid = grgid->gr_gid;
11024< -			else {
11025< -				ERROR("Gid %s invalid uid or unknown user\n",
11026< -					sgid);
11027< -				goto error;
11028< -			}
11029< -		}
11030< -
11031< +		}	
11032< +		break;
11033< +	case 'd':
11034< +	case 'm':
11035<  		break;
11036<  	default:
11037<  		ERROR("Unsupported type %c\n", type);
11038< @@ -313,6 +374,43 @@
11039<  	}
11040---
11041> @@ -19,18 +25,20 @@
110421604a190
11043>  pseudo.o: pseudo.c pseudo.h Makefile
110441606,1641c192,194
11045< +	if(mode > 0777) {
11046< +		ERROR("Mode %o out of range\n", mode);
11047< +		goto error;
11048< +	}
11049< +
11050< +	uid = strtoll(suid, &ptr, 10);
11051< +	if(*ptr == '\0') {
11052< +		if(uid < 0 || uid > ((1LL << 32) - 1)) {
11053< +			ERROR("Uid %s out of range\n", suid);
11054< +			goto error;
11055< +		}
11056< +	} else {
11057< +		struct passwd *pwuid = getpwnam(suid);
11058< +		if(pwuid)
11059< +			uid = pwuid->pw_uid;
11060< +		else {
11061< +			ERROR("Uid %s invalid uid or unknown user\n", suid);
11062< +			goto error;
11063< +		}
11064< +	}
11065< +		
11066< +	gid = strtoll(sgid, &ptr, 10);
11067< +	if(*ptr == '\0') {
11068< +		if(gid < 0 || gid > ((1LL << 32) - 1)) {
11069< +			ERROR("Gid %s out of range\n", sgid);
11070< +			goto error;
11071< +		}
11072< +	} else {
11073< +		struct group *grgid = getgrnam(sgid);
11074< +		if(grgid)
11075< +			gid = grgid->gr_gid;
11076< +		else {
11077< +			ERROR("Gid %s invalid uid or unknown user\n", sgid);
11078< +			goto error;
11079< +		}
11080< +	}
11081---
11082> -unsquashfs: unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o
11083> -	$(CC) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@
11084> +uncompress.o: uncompress.c uncompress.h
110851643,1653c196,197
11086<  	switch(type) {
11087<  	case 'b':
11088<  		mode |= S_IFBLK;
11089< @@ -323,16 +421,37 @@
11090<  	case 'd':
11091<  		mode |= S_IFDIR;
11092<  		break;
11093< +	case 'f':
11094< +		mode |= S_IFREG;
11095< +		break;
11096<  	}
11097---
11098> +unsquashfs: unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o uncompress.o
11099> +	$(CC) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o uncompress.o -lz -lpthread -lm $(LZMA_LIB) -o $@
111001655,1684c199,200
11101< -	dev.type = type;
11102< -	dev.mode = mode;
11103< -	dev.uid = uid;
11104< -	dev.gid = gid;
11105< -	dev.major = major;
11106< -	dev.minor = minor;
11107< +	dev = malloc(sizeof(struct pseudo_dev));
11108< +	if(dev == NULL)
11109< +		BAD_ERROR("Failed to create pseudo_dev\n");
11110< +
11111< +	dev->type = type;
11112< +	dev->mode = mode;
11113< +	dev->uid = uid;
11114< +	dev->gid = gid;
11115< +	dev->major = major;
11116< +	dev->minor = minor;
11117< +
11118< +	if(type == 'f') {
11119< +		int res;
11120< +
11121< +		printf("Executing dynamic pseudo file\n");
11122< +		printf("\t\"%s\"\n", def);
11123< +		res = exec_file(def + bytes, dev);
11124< +		if(res == -1) {
11125< +			ERROR("Failed to execute dynamic pseudo file definition"
11126< +				" \"%s\"\n", def);
11127< +			return FALSE;
11128< +		}
11129< +		add_pseudo_file(dev);
11130< +	}
11131---
11132> -unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile
11133> +unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h uncompress.h Makefile
111341686,1687c202,203
11135< -	*pseudo = add_pseudo(*pseudo, &dev, filename, filename);
11136< +	*pseudo = add_pseudo(*pseudo, dev, filename, filename);
11137---
11138> -unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h global.h Makefile
11139> +unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h global.h uncompress.h Makefile
111401689c205,206
11141<  	return TRUE;
11142---
11143> -unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile
11144> +unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h uncompress.h Makefile
111451691,1704c208,209
11146< diff -Nur squashfs4.0/squashfs-tools/pseudo.h squashfs4.0-lzma-snapshot/squashfs-tools/pseudo.h
11147< --- squashfs4.0/squashfs-tools/pseudo.h	2009-04-04 03:44:24.000000000 +0200
11148< +++ squashfs4.0-lzma-snapshot/squashfs-tools/pseudo.h	2009-10-20 06:03:38.000000000 +0200
11149< @@ -27,6 +27,12 @@
11150<  	unsigned int	gid;
11151<  	unsigned int	major;
11152<  	unsigned int	minor;
11153< +	int		pseudo_id;
11154< +	int		fd;
11155< +	int		child;
11156< +#ifdef USE_TMP_FILE
11157< +	char		*filename;
11158< +#endif
11159<  };
11160---
11161> -unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h global.h Makefile
11162> +unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h global.h uncompress.h Makefile
111631706,1721c211,212
11164<  struct pseudo_entry {
11165< @@ -46,3 +52,5 @@
11166<  extern int read_pseudo_file(struct pseudo **, char *);
11167<  extern struct pseudo *pseudo_subdir(char *, struct pseudo *);
11168<  extern struct pseudo_entry *pseudo_readdir(struct pseudo *);
11169< +extern struct pseudo_dev *get_pseudo_file(int);
11170< +extern void delete_pseudo_files();
11171< diff -Nur squashfs4.0/squashfs-tools/read_fs.c squashfs4.0-lzma-snapshot/squashfs-tools/read_fs.c
11172< --- squashfs4.0/squashfs-tools/read_fs.c	2009-03-31 06:23:14.000000000 +0200
11173< +++ squashfs4.0-lzma-snapshot/squashfs-tools/read_fs.c	2009-10-20 06:03:38.000000000 +0200
11174< @@ -36,7 +36,6 @@
11175<  #include <fcntl.h>
11176<  #include <errno.h>
11177<  #include <string.h>
11178< -#include <zlib.h>
11179<  #include <sys/mman.h>
11180---
11181> -unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h global.h Makefile
11182> +unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h global.h uncompress.h Makefile
111831723,1724c214,220
11184<  #ifndef linux
11185< @@ -51,6 +50,7 @@
11186---
11187>  clean:
11188>  	-rm -f *.o mksquashfs unsquashfs
11189> Index: squashfs4.0/squashfs-tools/read_fs.c
11190> ===================================================================
11191> --- squashfs4.0.orig/squashfs-tools/read_fs.c	2009-03-31 06:23:14.000000000 +0200
11192> +++ squashfs4.0/squashfs-tools/read_fs.c	2009-09-14 17:20:36.310480350 +0200
11193> @@ -51,6 +51,7 @@
111941728c224
11195< +#include "compressor.h"
11196---
11197> +#include "uncompress.h"
111981732,1750c228
11199< @@ -66,7 +66,9 @@
11200<  						fprintf(stderr, s, ## args); \
11201<  					} while(0)
11202<  
11203< -int read_block(int fd, long long start, long long *next, unsigned char *block,
11204< +static struct compressor *comp;
11205< +
11206< +int read_block(int fd, long long start, long long *next, void *block,
11207<  	squashfs_super_block *sBlk)
11208<  {
11209<  	unsigned short c_byte;
11210< @@ -77,32 +79,24 @@
11211<  
11212<  	if(SQUASHFS_COMPRESSED(c_byte)) {
11213<  		char buffer[SQUASHFS_METADATA_SIZE];
11214< -		int res;
11215< -		unsigned long bytes = SQUASHFS_METADATA_SIZE;
11216< +		int error, res;
11217<  
11218---
11219> @@ -83,17 +84,17 @@
112201756,1757c234,237
11221< -		if(res != Z_OK) {
11222< -			if(res == Z_MEM_ERROR)
11223---
11224> +		res = uncompress_wrapper(block, &bytes,
11225> +			(const unsigned char *) buffer, c_byte);
11226>  		if(res != Z_OK) {
11227>  			if(res == Z_MEM_ERROR)
112281759,1760c239,241
11229< -					"memory\n");
11230< -			else if(res == Z_BUF_ERROR)
11231---
11232> +				ERROR("uncompress failed, not enough "
11233>  					"memory\n");
11234>  			else if(res == Z_BUF_ERROR)
112351762,1763c243,245
11236< -					"room in output buffer\n");
11237< -			else
11238---
11239> +				ERROR("uncompress failed, not enough "
11240>  					"room in output buffer\n");
11241>  			else
112421765,1770c247,248
11243< -					"%d\n", res);
11244< +		res = comp->uncompress(block, buffer, c_byte,
11245< +			SQUASHFS_METADATA_SIZE, &error);
11246< +		if(res == -1) {
11247< +			ERROR("%s uncompress failed with error code %d\n",
11248< +				comp->name, error);
11249---
11250> +				ERROR("uncompress failed, unknown error "
11251>  					"%d\n", res);
112521773,1985c251,256
11253<  		if(next)
11254<  			*next = start + offset + c_byte;
11255< -		return bytes;
11256< +		return res;
11257<  	} else {
11258<  		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
11259< -		read_destination(fd, start + offset, c_byte, (char *) block);
11260< +		read_destination(fd, start + offset, c_byte, block);
11261<  		if(next)
11262<  			*next = start + offset + c_byte;
11263<  		return c_byte;
11264< @@ -356,7 +350,7 @@
11265<  }
11266<  
11267<  
11268< -int read_super(int fd, squashfs_super_block *sBlk, char *source)
11269< +struct compressor *read_super(int fd, squashfs_super_block *sBlk, char *source)
11270<  {
11271<  	read_destination(fd, SQUASHFS_START, sizeof(squashfs_super_block),
11272<  		(char *) sBlk);
11273< @@ -388,8 +382,18 @@
11274<  		goto failed_mount;
11275<  	}
11276<  
11277< +	/* Check the compression type */
11278< +	comp = lookup_compressor_id(sBlk->compression);
11279< +	if(!comp->supported) {
11280< +		ERROR("Filesystem on %s uses %s compression, this is"
11281< +			"unsupported by this version\n", source, comp->name);
11282< +		display_compressors("", "");
11283< +		goto failed_mount;
11284< +	}
11285< +
11286<  	printf("Found a valid %sSQUASHFS superblock on %s.\n",
11287<  		SQUASHFS_EXPORTABLE(sBlk->flags) ? "exportable " : "", source);
11288< +	printf("\tCompression used %s\n", comp->name);
11289<  	printf("\tInodes are %scompressed\n",
11290<  		SQUASHFS_UNCOMPRESSED_INODES(sBlk->flags) ? "un" : "");
11291<  	printf("\tData is %scompressed\n",
11292< @@ -417,10 +421,10 @@
11293<  	TRACE("sBlk->lookup_table_start %llx\n", sBlk->lookup_table_start);
11294<  	printf("\n");
11295<  
11296< -	return TRUE;
11297< +	return comp;
11298<  
11299<  failed_mount:
11300< -	return FALSE;
11301< +	return NULL;
11302<  }
11303<  
11304<  
11305< @@ -514,12 +518,17 @@
11306<  	SQUASHFS_INSWAP_ID_BLOCKS(index, indexes);
11307<  
11308<  	for(i = 0; i < indexes; i++) {
11309< -		int length;
11310< -		length = read_block(fd, index[i], NULL,
11311< +		int length = read_block(fd, index[i], NULL,
11312<  			((unsigned char *) id_table) +
11313<  			(i * SQUASHFS_METADATA_SIZE), sBlk);
11314<  		TRACE("Read id table block %d, from 0x%llx, length %d\n", i,
11315<  			index[i], length);
11316< +		if(length == 0) {
11317< +			ERROR("Failed to read id table block %d, from 0x%llx, "
11318< +				"length %d\n", i, index[i], length);
11319< +			free(id_table);
11320< +			return NULL;
11321< +		}
11322<  	}
11323<  
11324<  	SQUASHFS_INSWAP_INTS(id_table, sBlk->no_ids);
11325< @@ -563,6 +572,13 @@
11326<  			(i * SQUASHFS_METADATA_SIZE), sBlk);
11327<  		TRACE("Read fragment table block %d, from 0x%llx, length %d\n",
11328<  			i, fragment_table_index[i], length);
11329< +		if(length == 0) {
11330< +			ERROR("Failed to read fragment table block %d, from "
11331< +				"0x%llx, length %d\n", i,
11332< +				fragment_table_index[i], length);
11333< +			free(*fragment_table);
11334< +			return 0;
11335< +		}
11336<  	}
11337<  
11338<  	for(i = 0; i < sBlk->fragments; i++)
11339< @@ -599,6 +615,13 @@
11340<  			(i * SQUASHFS_METADATA_SIZE), sBlk);
11341<  		TRACE("Read inode lookup table block %d, from 0x%llx, length "
11342<  			"%d\n", i, index[i], length);
11343< +		if(length == 0) {
11344< +			ERROR("Failed to read inode lookup table block %d, "
11345< +				"from 0x%llx, length %d\n", i, index[i],
11346< +				length);
11347< +			free(*inode_lookup_table);
11348< +			return 0;
11349< +		}
11350<  	}
11351<  
11352<  	SQUASHFS_INSWAP_LONG_LONGS(*inode_lookup_table, sBlk->inodes);
11353< diff -Nur squashfs4.0/squashfs-tools/sort.c squashfs4.0-lzma-snapshot/squashfs-tools/sort.c
11354< --- squashfs4.0/squashfs-tools/sort.c	2009-03-31 06:25:53.000000000 +0200
11355< +++ squashfs4.0-lzma-snapshot/squashfs-tools/sort.c	2009-10-20 06:03:38.000000000 +0200
11356< @@ -198,7 +198,7 @@
11357<  	while(dir->current_count < dir->count) {
11358<  		struct dir_ent *dir_ent = dir->list[dir->current_count++];
11359<  		struct stat *buf = &dir_ent->inode->buf;
11360< -		if(dir_ent->data)
11361< +		if(dir_ent->inode->root_entry)
11362<  			continue;
11363<  
11364<  		switch(buf->st_mode & S_IFMT) {
11365< @@ -254,6 +254,7 @@
11366<  				write_file(&inode, entry->dir, &duplicate_file);
11367<  				INFO("file %s, uncompressed size %lld bytes %s"
11368<  					"\n", entry->dir->pathname,
11369< +					(long long)
11370<  					entry->dir->inode->buf.st_size,
11371<  					duplicate_file ? "DUPLICATE" : "");
11372<  				entry->dir->inode->inode = inode;
11373< @@ -261,6 +262,7 @@
11374<  			} else
11375<  				INFO("file %s, uncompressed size %lld bytes "
11376<  					"LINK\n", entry->dir->pathname,
11377< +					(long long)
11378<  					entry->dir->inode->buf.st_size);
11379<  		}
11380<  }
11381< diff -Nur squashfs4.0/squashfs-tools/sort.h squashfs4.0-lzma-snapshot/squashfs-tools/sort.h
11382< --- squashfs4.0/squashfs-tools/sort.h	2009-02-08 13:02:53.000000000 +0100
11383< +++ squashfs4.0-lzma-snapshot/squashfs-tools/sort.h	2009-10-20 06:03:38.000000000 +0200
11384< @@ -42,17 +42,19 @@
11385<  	struct inode_info	*inode;
11386<  	struct dir_info		*dir;
11387<  	struct dir_info		*our_dir;
11388< -	struct old_root_entry_info *data;
11389<  };
11390<  
11391<  struct inode_info {
11392< -	unsigned int		nlink;
11393<  	struct stat		buf;
11394< +	struct inode_info	*next;
11395<  	squashfs_inode		inode;
11396< -	unsigned int		type;
11397<  	unsigned int		inode_number;
11398< +	unsigned int		nlink;
11399< +	int			pseudo_id;
11400< +	char			type;
11401<  	char			read;
11402< -	struct inode_info	*next;
11403< +	char			root_entry;
11404< +	char			pseudo_file;
11405<  };
11406<  
11407<  struct priority_entry {
11408< diff -Nur squashfs4.0/squashfs-tools/squashfs_compat.h squashfs4.0-lzma-snapshot/squashfs-tools/squashfs_compat.h
11409< --- squashfs4.0/squashfs-tools/squashfs_compat.h	2009-03-16 05:27:27.000000000 +0100
11410< +++ squashfs4.0-lzma-snapshot/squashfs-tools/squashfs_compat.h	2009-10-20 06:03:38.000000000 +0200
11411< @@ -777,11 +777,10 @@
11412<  #endif
11413<  
11414<  #define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\
11415< -	int bits;\
11416< -	int b_pos = pos % 8;\
11417< -	unsigned long long val = 0;\
11418< -	unsigned char *s = (unsigned char *)p + (pos / 8);\
11419< -	unsigned char *d = ((unsigned char *) &val) + 7;\
11420< +	b_pos = pos % 8;\
11421< +	val = 0;\
11422< +	s = (unsigned char *)p + (pos / 8);\
11423< +	d = ((unsigned char *) &val) + 7;\
11424<  	for(bits = 0; bits < (tbits + b_pos); bits += 8) \
11425<  		*d-- = *s++;\
11426<  	value = (val >> (SHIFT))/* & ((1 << tbits) - 1)*/;\
11427< diff -Nur squashfs4.0/squashfs-tools/squashfs_fs.h squashfs4.0-lzma-snapshot/squashfs-tools/squashfs_fs.h
11428< --- squashfs4.0/squashfs-tools/squashfs_fs.h	2009-03-18 03:50:20.000000000 +0100
11429< +++ squashfs4.0-lzma-snapshot/squashfs-tools/squashfs_fs.h	2009-10-20 06:03:38.000000000 +0200
11430< @@ -229,6 +229,7 @@
11431<  typedef long long		squashfs_inode_t;
11432<  
11433<  #define ZLIB_COMPRESSION	1
11434< +#define LZMA_COMPRESSION	2
11435<  
11436<  struct squashfs_super_block {
11437<  	unsigned int		s_magic;
11438< diff -Nur squashfs4.0/squashfs-tools/unsquash-3.c squashfs4.0-lzma-snapshot/squashfs-tools/unsquash-3.c
11439< --- squashfs4.0/squashfs-tools/unsquash-3.c	2009-03-31 06:35:10.000000000 +0200
11440< +++ squashfs4.0-lzma-snapshot/squashfs-tools/unsquash-3.c	2009-10-20 06:03:38.000000000 +0200
11441< @@ -36,7 +36,7 @@
11442<  		sBlk.fragment_table_start);
11443<  
11444<  	if(sBlk.fragments == 0)
11445< -		return;
11446< +		return TRUE;
11447<  
11448<  	if((fragment_table = malloc(sBlk.fragments *
11449<  			sizeof(squashfs_fragment_entry_3))) == NULL)
11450< diff -Nur squashfs4.0/squashfs-tools/unsquash-4.c squashfs4.0-lzma-snapshot/squashfs-tools/unsquash-4.c
11451< --- squashfs4.0/squashfs-tools/unsquash-4.c	2009-03-31 06:38:31.000000000 +0200
11452< +++ squashfs4.0-lzma-snapshot/squashfs-tools/unsquash-4.c	2009-10-20 06:03:38.000000000 +0200
11453< @@ -38,7 +38,7 @@
11454<  		sBlk.fragment_table_start);
11455<  
11456<  	if(sBlk.fragments == 0)
11457< -		return;
11458< +		return TRUE;
11459<  
11460<  	if((fragment_table = malloc(sBlk.fragments *
11461<  			sizeof(squashfs_fragment_entry))) == NULL)
11462< diff -Nur squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0-lzma-snapshot/squashfs-tools/unsquashfs.c
11463< --- squashfs4.0/squashfs-tools/unsquashfs.c	2009-04-05 23:23:06.000000000 +0200
11464< +++ squashfs4.0-lzma-snapshot/squashfs-tools/unsquashfs.c	2009-10-20 06:03:39.000000000 +0200
11465< @@ -25,6 +25,7 @@
11466---
11467> Index: squashfs4.0/squashfs-tools/unsquashfs.c
11468> ===================================================================
11469> --- squashfs4.0.orig/squashfs-tools/unsquashfs.c	2009-04-05 23:23:06.000000000 +0200
11470> +++ squashfs4.0/squashfs-tools/unsquashfs.c	2009-09-14 17:20:36.310480350 +0200
11471> @@ -24,6 +24,7 @@
11472>  #include "unsquashfs.h"
114731987a259
11474> +#include "uncompress.h"
114751989d260
11476< +#include "compressor.h"
114771992,2009c263
11478<  struct queue *to_reader, *to_deflate, *to_writer, *from_writer;
11479< @@ -36,6 +39,7 @@
11480<  
11481<  struct super_block sBlk;
11482<  squashfs_operations s_ops;
11483< +struct compressor *comp;
11484<  
11485<  int bytes = 0, swap, file_count = 0, dir_count = 0, sym_count = 0,
11486<  	dev_count = 0, fifo_count = 0;
11487< @@ -590,31 +594,23 @@
11488<  		offset = 3;
11489<  	if(SQUASHFS_COMPRESSED(c_byte)) {
11490<  		char buffer[SQUASHFS_METADATA_SIZE];
11491< -		int res;
11492< -		unsigned long bytes = SQUASHFS_METADATA_SIZE;
11493< +		int error, res;
11494<  
11495<  		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
11496---
11497> @@ -597,18 +598,17 @@
114982014,2019c268,272
11499< -			(const unsigned char *) buffer, c_byte);
11500< +		res = comp->uncompress(block, buffer, c_byte,
11501< +			SQUASHFS_METADATA_SIZE, &error);
11502<  
11503< -		if(res != Z_OK) {
11504< -			if(res == Z_MEM_ERROR)
11505---
11506> +		res = uncompress_wrapper((unsigned char *) block, &bytes,
11507>  			(const unsigned char *) buffer, c_byte);
11508> -
11509>  		if(res != Z_OK) {
11510>  			if(res == Z_MEM_ERROR)
115112021,2022c274,276
11512< -					"memory\n");
11513< -			else if(res == Z_BUF_ERROR)
11514---
11515> +				ERROR("uncompress failed, not enough "
11516>  					"memory\n");
11517>  			else if(res == Z_BUF_ERROR)
115182024,2025c278,280
11519< -					"room in output buffer\n");
11520< -			else
11521---
11522> +				ERROR("uncompress failed, not enough "
11523>  					"room in output buffer\n");
11524>  			else
115252027,2030c282,283
11526< -					"%d\n", res);
11527< +		if(res == -1) {
11528< +			ERROR("%s uncompress failed with error code %d\n",
11529< +				comp->name, error);
11530---
11531> +				ERROR("uncompress failed, unknown error "
11532>  					"%d\n", res);
115332033,2055c286
11534<  		if(next)
11535<  			*next = start + offset + c_byte;
11536< -		return bytes;
11537< +		return res;
11538<  	} else {
11539<  		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
11540<  		if(read_bytes(start + offset, c_byte, block) == FALSE)
11541< @@ -632,36 +628,26 @@
11542<  
11543<  int read_data_block(long long start, unsigned int size, char *block)
11544<  {
11545< -	int res;
11546< -	unsigned long bytes = block_size;
11547< +	int error, res;
11548<  	int c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(size);
11549<  
11550<  	TRACE("read_data_block: block @0x%llx, %d %s bytes\n", start,
11551< -		SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte),
11552< -		SQUASHFS_COMPRESSED_BLOCK(c_byte) ? "compressed" :
11553< +		c_byte, SQUASHFS_COMPRESSED_BLOCK(size) ? "compressed" :
11554<  		"uncompressed");
11555<  
11556<  	if(SQUASHFS_COMPRESSED_BLOCK(size)) {
11557---
11558> @@ -645,18 +645,17 @@
115592060,2064c291,295
11560< -			(const unsigned char *) data, c_byte);
11561< +		res = comp->uncompress(block, data, c_byte, block_size, &error);
11562<  
11563< -		if(res != Z_OK) {
11564< -			if(res == Z_MEM_ERROR)
11565---
11566> +		res = uncompress_wrapper((unsigned char *) block, &bytes,
11567>  			(const unsigned char *) data, c_byte);
11568> -
11569>  		if(res != Z_OK) {
11570>  			if(res == Z_MEM_ERROR)
115712066,2067c297,299
11572< -					"memory\n");
11573< -			else if(res == Z_BUF_ERROR)
11574---
11575> +				ERROR("uncompress failed, not enough "
11576>  					"memory\n");
11577>  			else if(res == Z_BUF_ERROR)
115782069,2070c301,303
11579< -					"room in output buffer\n");
11580< -			else
11581---
11582> +				ERROR("uncompress failed, not enough "
11583>  					"room in output buffer\n");
11584>  			else
115852072,2075c305,306
11586< -					"%d\n", res);
11587< +		if(res == -1) {
11588< +			ERROR("%s uncompress failed with error code %d\n",
11589< +				comp->name, error);
11590---
11591> +				ERROR("uncompress failed, unknown error "
11592>  					"%d\n", res);
115932078,2115c309
11594<  
11595< -		return bytes;
11596< +		return res;
11597<  	} else {
11598<  		if(read_bytes(start, c_byte, block) == FALSE)
11599<  			goto failed;
11600< @@ -671,7 +657,7 @@
11601<  
11602<  failed:
11603<  	ERROR("read_data_block: failed to read block @0x%llx, size %d\n", start,
11604< -		size);
11605< +		c_byte);
11606<  	return FALSE;
11607<  }
11608<  
11609< @@ -1383,6 +1369,11 @@
11610<  #endif
11611<  	printf("Creation or last append time %s", mkfs_str ? mkfs_str :
11612<  		"failed to get time\n");
11613< +	printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n",
11614< +		sBlk.bytes_used / 1024.0, sBlk.bytes_used / (1024.0 * 1024.0));
11615< +	if(sBlk.s_major == 4)
11616< +		printf("Compression %s\n", comp->name);
11617< +	printf("Block size %d\n", sBlk.block_size);
11618<  	printf("Filesystem is %sexportable via NFS\n",
11619<  		SQUASHFS_EXPORTABLE(sBlk.flags) ? "" : "not ");
11620<  
11621< @@ -1409,9 +1400,6 @@
11622<  			SQUASHFS_DUPLICATES(sBlk.flags) ? "" : "not ");
11623<  	else
11624<  		printf("Duplicates are removed\n");
11625< -	printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n",
11626< -		sBlk.bytes_used / 1024.0, sBlk.bytes_used / (1024.0 * 1024.0));
11627< -	printf("Block size %d\n", sBlk.block_size);
11628<  	if(sBlk.s_major > 1)
11629<  		printf("Number of fragments %d\n", sBlk.fragments);
11630<  	printf("Number of inodes %d\n", sBlk.inodes);
11631< @@ -1459,6 +1447,18 @@
11632---
11633> @@ -1459,7 +1458,7 @@
116342119,2131c313,314
11635< +
11636< +		/*
11637< +		 * Check the compression type
11638< +		 */
11639< +		comp = lookup_compressor_id(sBlk.compression);
11640< +		if(!comp->supported) {
11641< +			ERROR("Filesystem uses %s compression, this is "
11642< +				"unsupported by this version\n", comp->name);
11643< +			ERROR("Decompressors available:\n");
11644< +			display_compressors("", "");
11645< +			goto failed_mount;
11646< +		}
11647<  		return TRUE;
11648---
11649> -		return TRUE;
11650> +		goto done;
116512134c317,318
11652< @@ -1548,6 +1548,11 @@
11653---
11654>  	/*
11655> @@ -1548,6 +1547,9 @@
116562138,2142c322,324
11657< +	/*
11658< +	 * 1.x, 2.x and 3.x filesystems use gzip compression.  Gzip is always
11659< +	 * suppported.
11660< +	 */
11661< +	comp = lookup_compressor("gzip");
11662---
11663> +done:
11664> +	compression = sBlk.compression;
11665> +
116662146,2152c328,330
11667< @@ -1707,32 +1712,24 @@
11668<  
11669<  	while(1) {
11670<  		struct cache_entry *entry = queue_get(to_deflate);
11671< -		int res;
11672< -		unsigned long bytes = block_size;
11673< +		int error, res;
11674---
11675> @@ -1710,19 +1712,19 @@
11676>  		int res;
11677>  		unsigned long bytes = block_size;
116782155,2159c333,338
11679< -			(const unsigned char *) entry->data,
11680< -			SQUASHFS_COMPRESSED_SIZE_BLOCK(entry->size));
11681< -
11682< -		if(res != Z_OK) {
11683< -			if(res == Z_MEM_ERROR)
11684---
11685> +		res = uncompress_wrapper((unsigned char *) tmp, &bytes,
11686>  			(const unsigned char *) entry->data,
11687>  			SQUASHFS_COMPRESSED_SIZE_BLOCK(entry->size));
11688>  
11689>  		if(res != Z_OK) {
11690>  			if(res == Z_MEM_ERROR)
116912161,2162c340,342
11692< -					"memory\n");
11693< -			else if(res == Z_BUF_ERROR)
11694---
11695> +				ERROR("uncompress failed, not enough"
11696>  					"memory\n");
11697>  			else if(res == Z_BUF_ERROR)
116982164,2165c344,346
11699< -					"room in output buffer\n");
11700< -			else
11701---
11702> +				ERROR("uncompress failed, not enough "
11703>  					"room in output buffer\n");
11704>  			else
117052167,2226c348,462
11706< -					"%d\n", res);
11707< -		} else
11708< -			memcpy(entry->data, tmp, bytes);
11709< +		res = comp->uncompress(tmp, entry->data,
11710< +			SQUASHFS_COMPRESSED_SIZE_BLOCK(entry->size), block_size,
11711< +			&error);
11712< +
11713< +		if(res == -1)
11714< +			ERROR("%s uncompress failed with error code %d\n",
11715< +				comp->name, error);
11716< +		else
11717< +			memcpy(entry->data, tmp, res);
11718<  
11719<  		/*
11720<  		 * block has been either successfully decompressed, or an error
11721<   		 * occurred, clear pending flag, set error appropriately and
11722<   		 * wake up any threads waiting on this block
11723<   		 */ 
11724< -		cache_block_ready(entry, res != Z_OK);
11725< +		cache_block_ready(entry, res == -1);
11726<  	}
11727<  }
11728<  
11729< @@ -1913,7 +1910,7 @@
11730<  
11731<  
11732<  #define VERSION() \
11733< -	printf("unsquashfs version 4.0 (2009/04/05)\n");\
11734< +	printf("unsquashfs version 4.1-CVS (2009/08/30)\n");\
11735<  	printf("copyright (C) 2009 Phillip Lougher <phillip@lougher.demon.co.uk>"\
11736<  		"\n\n");\
11737<      	printf("This program is free software; you can redistribute it and/or\n");\
11738< @@ -1938,7 +1935,6 @@
11739<  	int fragment_buffer_size = FRAGMENT_BUFFER_DEFAULT;
11740<  	int data_buffer_size = DATA_BUFFER_DEFAULT;
11741<  	char *b;
11742< -	struct winsize winsize;
11743<  
11744<  	pthread_mutex_init(&screen_mutex, NULL);
11745<  	root_process = geteuid() == 0;
11746< @@ -2087,6 +2083,8 @@
11747<  				"regular expressions\n");
11748<  			ERROR("\t\t\t\trather than use the default shell "
11749<  				"wildcard\n\t\t\t\texpansion (globbing)\n");
11750< +			ERROR("\nDecompressors available:\n");
11751< +			display_compressors("", "");
11752<  		}
11753<  		exit(1);
11754<  	}
11755< diff -Nur squashfs4.0/squashfs-tools/unsquashfs.h squashfs4.0-lzma-snapshot/squashfs-tools/unsquashfs.h
11756< --- squashfs4.0/squashfs-tools/unsquashfs.h	2009-03-29 04:29:02.000000000 +0200
11757< +++ squashfs4.0-lzma-snapshot/squashfs-tools/unsquashfs.h	2009-10-20 06:03:39.000000000 +0200
11758< @@ -31,7 +31,6 @@
11759<  #include <fcntl.h>
11760<  #include <errno.h>
11761<  #include <string.h>
11762< -#include <zlib.h>
11763<  #include <sys/mman.h>
11764<  #include <utime.h>
11765<  #include <pwd.h>
11766---
11767> +				ERROR("uncompress failed, unknown error "
11768>  					"%d\n", res);
11769>  		} else
11770>  			memcpy(entry->data, tmp, bytes);
11771> Index: squashfs4.0/squashfs-tools/mksquashfs.h
11772> ===================================================================
11773> --- squashfs4.0.orig/squashfs-tools/mksquashfs.h	2009-02-19 19:31:08.000000000 +0100
11774> +++ squashfs4.0/squashfs-tools/mksquashfs.h	2009-09-14 17:20:36.310480350 +0200
11775> @@ -41,4 +41,9 @@
11776>  #define SQUASHFS_SWAP_LONG_LONGS(s, d, n) \
11777>  					memcpy(d, s, n * sizeof(long long))
11778>  #endif
11779> +
11780> +extern int uncompress_wrapper(unsigned char *dest, unsigned long *dest_len,
11781> +    const unsigned char *src, unsigned long src_len);
11782> +
11783> +
11784>  #endif
11785> Index: squashfs4.0/squashfs-tools/uncompress.c
11786> ===================================================================
11787> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
11788> +++ squashfs4.0/squashfs-tools/uncompress.c	2009-09-14 17:20:36.310480350 +0200
11789> @@ -0,0 +1,58 @@
11790> +/*
11791> + * Copyright (c) 2009  Felix Fietkau <nbd@openwrt.org>
11792> + *
11793> + * This program is free software; you can redistribute it and/or
11794> + * modify it under the terms of the GNU General Public License
11795> + * as published by the Free Software Foundation; either version 2,
11796> + * or (at your option) any later version.
11797> + *
11798> + * This program is distributed in the hope that it will be useful,
11799> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
11800> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11801> + * GNU General Public License for more details.
11802> + *
11803> + * You should have received a copy of the GNU General Public License
11804> + * along with this program; if not, write to the Free Software
11805> + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
11806> + *
11807> + * uncompress.c
11808> + */
11809> +
11810> +
11811> +
11812> +#ifdef USE_LZMA
11813> +#include <LzmaLib.h>
11814> +#endif
11815> +#include <zlib.h>
11816> +#include "squashfs_fs.h"
11817> +
11818> +/* compression algorithm */
11819> +int compression = ZLIB_COMPRESSION;
11820> +
11821> +
11822> +int uncompress_wrapper(unsigned char *dest, unsigned long *dest_len,
11823> +	const unsigned char *src, unsigned long src_len)
11824> +{
11825> +	int res;
11826> +
11827> +#ifdef USE_LZMA
11828> +	if (compression == LZMA_COMPRESSION) {
11829> +		size_t slen = src_len - LZMA_PROPS_SIZE;
11830> +		res = LzmaUncompress((unsigned char *)dest, dest_len,
11831> +			(const unsigned char *) src + LZMA_PROPS_SIZE, &slen,
11832> +			(const unsigned char *) src, LZMA_PROPS_SIZE);
11833> +		switch(res) {
11834> +		case SZ_OK:
11835> +			res = Z_OK;
11836> +			break;
11837> +		case SZ_ERROR_MEM:
11838> +			res = Z_MEM_ERROR;
11839> +			break;
11840> +		}
11841> +	} else
11842> +#endif
11843> +	res = uncompress(dest, dest_len, src, src_len);
11844> +	return res;
11845> +}
11846> +
11847> +
11848> Index: squashfs4.0/squashfs-tools/uncompress.h
11849> ===================================================================
11850> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
11851> +++ squashfs4.0/squashfs-tools/uncompress.h	2009-09-14 17:20:36.310480350 +0200
11852> @@ -0,0 +1,29 @@
11853> +/*
11854> + * Copyright (c) 2009  Felix Fietkau <nbd@openwrt.org>
11855> + *
11856> + * This program is free software; you can redistribute it and/or
11857> + * modify it under the terms of the GNU General Public License
11858> + * as published by the Free Software Foundation; either version 2,
11859> + * or (at your option) any later version.
11860> + *
11861> + * This program is distributed in the hope that it will be useful,
11862> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
11863> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11864> + * GNU General Public License for more details.
11865> + *
11866> + * You should have received a copy of the GNU General Public License
11867> + * along with this program; if not, write to the Free Software
11868> + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
11869> + *
11870> + * uncompress.h
11871> + */
11872> +
11873> +#ifdef USE_LZMA
11874> +#include <LzmaLib.h>
11875> +#endif
11876> +
11877> +extern int compression;
11878> +extern int uncompress_wrapper(unsigned char *dest, unsigned long *dest_len,
11879> +    const unsigned char *src, unsigned long src_len);
11880> +
11881> +
11882diff -r WNDR4300v2-basecompare/tools/squashfs4/patches/120-cygwin_fixes.patch WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/squashfs4/patches/120-cygwin_fixes.patch
118831,3c1,4
11884< --- a/squashfs-tools/global.h
11885< +++ b/squashfs-tools/global.h
11886< @@ -44,6 +44,11 @@ typedef long long squashfs_fragment_inde
11887---
11888> diff -urN squashfs4.0/squashfs-tools/global.h squashfs4.0.new/squashfs-tools/global.h
11889> --- squashfs4.0/squashfs-tools/global.h	2009-08-27 21:33:03.000000000 +0200
11890> +++ squashfs4.0.new/squashfs-tools/global.h	2009-08-27 21:36:38.000000000 +0200
11891> @@ -44,6 +44,11 @@
1189215,16c16,18
11893< --- a/squashfs-tools/mksquashfs.c
11894< +++ b/squashfs-tools/mksquashfs.c
11895---
11896> diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools/mksquashfs.c
11897> --- squashfs4.0/squashfs-tools/mksquashfs.c	2009-08-27 21:33:06.000000000 +0200
11898> +++ squashfs4.0.new/squashfs-tools/mksquashfs.c	2009-08-27 21:37:22.000000000 +0200
1189918c20
11900<  #include <sys/wait.h>
11901---
11902>  #include <fnmatch.h>
1190330c32
11904< @@ -817,6 +819,7 @@ void sigusr1_handler()
11905---
11906> @@ -825,6 +827,7 @@
1190738c40
11908< @@ -826,6 +829,9 @@ void sigwinch_handler()
11909---
11910> @@ -834,6 +837,9 @@
1191148c50
11912< @@ -3853,7 +3859,9 @@ void initialise_threads()
11913---
11914> @@ -3753,7 +3759,9 @@
1191559c61
11916< @@ -3875,6 +3883,7 @@ void initialise_threads()
11917---
11918> @@ -3775,6 +3783,7 @@
1191967,69c69,72
11920< --- a/squashfs-tools/read_fs.c
11921< +++ b/squashfs-tools/read_fs.c
11922< @@ -39,9 +39,11 @@ extern unsigned int get_guid(unsigned in
11923---
11924> diff -urN squashfs4.0/squashfs-tools/read_fs.c squashfs4.0.new/squashfs-tools/read_fs.c
11925> --- squashfs4.0/squashfs-tools/read_fs.c	2009-08-27 21:33:06.000000000 +0200
11926> +++ squashfs4.0.new/squashfs-tools/read_fs.c	2009-08-27 21:41:54.000000000 +0200
11927> @@ -40,9 +40,11 @@
1192881,82c84,86
11929< --- a/squashfs-tools/swap.c
11930< +++ b/squashfs-tools/swap.c
11931---
11932> diff -urN squashfs4.0/squashfs-tools/swap.c squashfs4.0.new/squashfs-tools/swap.c
11933> --- squashfs4.0/squashfs-tools/swap.c	2009-03-26 05:40:16.000000000 +0100
11934> +++ squashfs4.0.new/squashfs-tools/swap.c	2009-08-27 21:44:52.000000000 +0200
1193595,97c99,102
11936< --- a/squashfs-tools/unsquashfs.c
11937< +++ b/squashfs-tools/unsquashfs.c
11938< @@ -112,6 +112,7 @@ void update_progress_bar();
11939---
11940> diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools/unsquashfs.c
11941> --- squashfs4.0/squashfs-tools/unsquashfs.c	2009-08-27 21:33:06.000000000 +0200
11942> +++ squashfs4.0.new/squashfs-tools/unsquashfs.c	2009-08-27 21:41:38.000000000 +0200
11943> @@ -111,6 +111,7 @@
11944105c110
11945< @@ -121,6 +122,9 @@ void sigwinch_handler()
11946---
11947> @@ -120,6 +121,9 @@
11948115c120
11949< @@ -1787,7 +1791,9 @@ void initialise_threads(int fragment_buf
11950---
11951> @@ -1794,7 +1798,9 @@
11952126c131
11953< @@ -1809,6 +1815,7 @@ void initialise_threads(int fragment_buf
11954---
11955> @@ -1816,6 +1822,7 @@
11956134,136c139,142
11957< --- a/squashfs-tools/unsquashfs.h
11958< +++ b/squashfs-tools/unsquashfs.h
11959< @@ -45,10 +45,12 @@
11960---
11961> diff -urN squashfs4.0/squashfs-tools/unsquashfs.h squashfs4.0.new/squashfs-tools/unsquashfs.h
11962> --- squashfs4.0/squashfs-tools/unsquashfs.h	2009-08-27 21:33:03.000000000 +0200
11963> +++ squashfs4.0.new/squashfs-tools/unsquashfs.h	2009-08-27 21:44:17.000000000 +0200
11964> @@ -46,10 +46,12 @@
11965Seulement dans WNDR4300v2-basecompare/tools/squashfs4/patches: 130-lzma_props.patch
11966Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/squashfs4/patches: 130-merge-from-lsdk-3.4.1.patch
11967Seulement dans WNDR4300v2-gpl_src_V1.0.0.32/WNDR4300v2-V1.0.0.32_gpl_src/tools/squashfs4/patches: 140-add-lzma-option.patch