Chameleon

Chameleon Commit Details

Date:2011-06-06 14:32:23 (12 years 10 months ago)
Author:Azimutz
Commit:978
Parents: 977
Message:Merge trunk (r884/r886/r887)... sort of; some files i just copy/paste so, they become up to date before time :)
Changes:
M/branches/azimutz/Chazi/i386/config/Makefile
M/branches/azimutz/Chazi/Makefile
M/branches/azimutz/Chazi/i386/config/confdata.c
M/branches/azimutz/Chazi
M/branches/azimutz/Chazi/Make.rules
M/branches/azimutz/Chazi/i386/Makefile
M/branches/azimutz/Chazi/i386/config/cconfig.c
M/branches/azimutz/Chazi/CHANGES

File differences

branches/azimutz/Chazi/i386/config/cconfig.c
523523
524524
525525
526
526527
527528
528529
......
799800
800801
801802
803
802804
805
806
807
803808
804809
810
805811
806812
807813
......
813819
814820
815821
816
817
818
819
820
821
822
823
824
822
823
824
825
826
827
828
829
830
831
832
825833
826
827
828
829
830
831
832
833
834
835
836
837
838
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
839855
840856
841857
......
847863
848864
849865
850
866
867
851868
852869
853870
␉int s_scroll = 0;␊
␊
␉while (1) {␊
␊
␉␉item_reset();␊
␉␉current_menu = menu;␊
␉␉build_conf(menu);␊
␉int saved_x, saved_y;␊
␉char *mode;␊
␉int res;␊
int rebuild = 0;␊
␊
if(ac > 2 && (strcmp(av[2], "rebuild") == 0)) rebuild = 1;␊
␊
␊
␉setlocale(LC_ALL, "");␊
␉bindtextdomain(PACKAGE, LOCALEDIR);␊
␊
␉textdomain(PACKAGE);␊
␊
␉conf_parse(av[1]);␊
␉␉␉single_menu_mode = 1;␊
␉}␊
␊
␉initscr();␊
␊
␉getyx(stdscr, saved_y, saved_x);␊
␉if (init_dialog(NULL)) {␊
␉␉fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));␊
␉␉fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));␊
␉␉return 1;␊
␉}␊
␊
if(!rebuild)␊
{␊
initscr();␊
␊
getyx(stdscr, saved_y, saved_x);␊
if (init_dialog(NULL)) {␊
fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));␊
fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));␊
return 1;␊
}␊
} ␊
␉set_config_filename(conf_get_configname());␊
␉do {␊
␉␉conf(&rootmenu);␊
␉␉dialog_clear();␊
␉␉if (conf_get_changed())␊
␉␉␉res = dialog_yesno(NULL,␊
_("Do you wish to save your "␊
"new configuration?\n"␊
"<ESC><ESC> to continue."),␊
6, 60);␊
␉␉else␊
␉␉␉res = -1;␊
␉} while (res == KEY_ESC);␊
␉end_dialog(saved_x, saved_y);␊
if(rebuild)␊
{␊
res = 0;␊
}␊
else␊
{␊
do {␊
conf(&rootmenu);␊
dialog_clear();␊
if (conf_get_changed())␊
res = dialog_yesno(NULL,␊
_("Do you wish to save your "␊
"new configuration?\n"␊
"<ESC><ESC> to continue."),␊
6, 60);␊
else␊
res = -1;␊
} while (res == KEY_ESC);␊
end_dialog(saved_x, saved_y);␊
}␊
␊
␊
␉switch (res) {␊
case 0:␊
return 1;␊
}␊
case -1:␊
printf(_("\n\n"␊
if(!rebuild)␊
printf(_("\n\n"␊
"*** End of the configuration.\n"␊
"*** Execute 'make' to start the build or try 'make help'."␊
"\n\n"));␊
branches/azimutz/Chazi/i386/config/confdata.c
659659
660660
661661
662
662
663663
664664
665665
␉␉␉return 1;␊
␉}␊
␊
␉conf_message(_("configuration written to %s"), newname);␊
//␉conf_message(_("configuration written to %s"), newname);␊
␊
␉sym_set_change_count(0);␊
␊
branches/azimutz/Chazi/i386/config/Makefile
4747
4848
4949
50
51
52
5053
54
5155
5256
5357
␊
config: $(DIRS_NEEDED) $(SYMPROG)␊
␉@cd ${SRCROOT} && $(SYMPROG) $(SRCROOT)/Cconfig␊
␉␊
rebuild_config: $(DIRS_NEEDED) $(SYMPROG)␊
␉@cd ${SRCROOT} && $(SYMPROG) $(SRCROOT)/Cconfig rebuild␊
␊
␊
.PHONY: config␊
␊
#dependencies␊
branches/azimutz/Chazi/i386/Makefile
3737
3838
3939
40
40
4141
4242
4343
␉␉) || exit $$?; ␉␉␉␉␉␉ \␊
␉done␊
␉␊
config:␊
config rebuild_config:␊
␉@for i in config; \␊
␉do \␊
␉␉echo ================= make $@ for $$i =================; \␊
branches/azimutz/Chazi/Make.rules
104104
105105
106106
107
107
108108
109109
110110
......
123123
124124
125125
126
127
␉␊
$(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/.config:␊
␉@echo "\t[MAKE] config"␊
␉@cd $(SRCROOT) && make config␊
␉@cd $(SRCROOT) && make rebuild_config␊
␊
.PHONY: clean␊
clean:␊
␉␉␉$(SRCROOT)/autoconf.h \␊
␉␉␉$(SRCROOT)/autoconf.inc␊
␊
␊
.DEFAULT_GOAL := all␊
branches/azimutz/Chazi/CHANGES
1
1
2
3
4
25
36
47
......
2528
2629
2730
28
31
2932
3033
3134
......
3942
4043
4144
42
45
4346
4447
4548
46
49
50
4751
4852
4953
5054
5155
5256
53
57
5458
5559
5660
- Added the BOOT2_MAX_LENGTH constant in memory.h. This is now used in moot.c to relocate the correct number of bytes for boot2.␊
- Modules can now be selected between not compiled, compiled into chameleon, or compiled as modules.␊
- New makefile + configuration system.␊
- Added the BOOT2_MAX_LENGTH constant in memory.h. This is now used in mboot.c to relocate the correct␊
number of bytes for boot2.␊
- Added new ATi/AMD Graphics Card Enabler.␊
- Added new SMBIOS patcher.␊
- Added module system.␊
- Optimized cursor spinout in textmode if no verbose mode is set␊
- Added ram table structures definitions␊
- Added getSmbios() a param permitting to select between orig and new smbios entries␊
- Changed "Default Partition" behavior to accept only native system volumes or foreign partitions.␊
- Changed "Default Partition" behaviour to accept only native system volumes or foreign partitions.␊
- Added NVIDIA new NVCAP customization support and support for ION gfx cards from aserebln␊
- Added ATI new framebuffers support and new cards from PCEFI10.6␊
- improved ACPI file search algo by implementing a cache.␊
conversions api, to be completed by function that we should reuse.␊
␊
- Fixed SystemType would be always forced to a value, now optionally changed␊
only if overriden␊
only if overridden␊
- Kept SystemID as the only option to change manually the system-id ␊
For theses reasons, SystemId from bootConfig and SMUUID from smbiosConfig are now DEPRECATED.␊
␊
- Integrated JrCs fadt patch (kept for RC5 the existing DSDT.aml retry algo that disappeared in his patch, should be more discussed for RC6)␊
- Integrated JrCs fadt patch (kept for RC5 the existing DSDT.aml retry algo that disappeared in his patch,␊
should be more discussed for RC6)␊
- Added JrCs modified convention name change to coding_standards␊
- Now malloc (ex. MALLOC in Asere patch) is renamed malloc(size) and is an alias ␊
to safe_malloc(size, file, line) with _FILE_ and _LINE_ preprocessor definitions␊
- Added a new 'Rename Partition Feature', now permitting to rename partition ␊
like 'System reserved' to a more meaningful name␊
- Added SystemID option permitting to change the System UUID to a fixed value.␊
- Added the PciRoot autodetection feature imported from pcefi10.5␊
- Added the PciRoot auto detection feature imported from pcefi10.5␊
- Added automatic "system-id" injection from dmi bios, also compatible ␊
with SystemID boot option and former SMUUID from smbios,plist␊
- Added "system-type' automatic injection (1=Desktop) plus override possibility ␊
branches/azimutz/Chazi/Makefile
3030
3131
3232
33
33
3434
3535
3636
......
9393
9494
9595
96
#␊
# Currently builds for i386␊
#␊
clean config:␊
config rebuild_config:␊
␉@if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi␊
␉@echo ================= make config for i386 =================;␊
␉@( OBJROOT=$(OBJROOT)/i386;␉␉␉␉ \␊
␊
.PHONY: config␊
.PHONY: clean␊
.DEFAULT_GOAL := all␊␊

Archive Download the corresponding diff file

Revision: 978