dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a small bug in the config merge/split (fixes buildbot error on ixp4xx)

Browse Source 
SVN-Revision: 6427
v19.07.3_mercusys_ac12_duma
Felix Fietkau 17 years ago
parent f5616580b3
commit 74f71f0739
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
scripts/config.pl
Unescape Escape View File

@ -23,7 +23,7 @@ sub load_config($) {
next; next;
}; };
/^# CONFIG_(.+?) is not set/ and do { /^# CONFIG_(.+?) is not set/ and do {
$config{$1} = -1; $config{$1} = "#undef";
next; next;
}; };
/^#/ and next; /^#/ and next;
@ -91,7 +91,7 @@ sub config_sub($$) {
sub print_cfgline($$) { sub print_cfgline($$) {
my $name = shift; my $name = shift;
my $val = shift; my $val = shift;
if ($val eq '-1') { if ($val eq '#undef') {
print "# CONFIG_$name is not set\n"; print "# CONFIG_$name is not set\n";
} else { } else {
print "CONFIG_$name=$val\n"; print "CONFIG_$name=$val\n";

3
target/linux/ixp4xx-2.6/config/default
Unescape Escape View File

@ -265,7 +265,7 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PLATRAM is not set
# CONFIG_MTD_PMC551 is not set # CONFIG_MTD_PMC551 is not set
# CONFIG_MTD_RAM is not set # CONFIG_MTD_RAM is not set
# CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK is not set CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_PARTS_READONLY=y CONFIG_MTD_REDBOOT_PARTS_READONLY=y
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@ -331,7 +331,6 @@ CONFIG_PATA_ARTOP=m
# CONFIG_PATA_VIA is not set # CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set # CONFIG_PATA_WINBOND is not set
# CONFIG_PC300 is not set # CONFIG_PC300 is not set
# CONFIG_PCMCIA is not set
# CONFIG_PCCARD is not set # CONFIG_PCCARD is not set
# CONFIG_PCI200SYN is not set # CONFIG_PCI200SYN is not set
# CONFIG_PCIPCWATCHDOG is not set # CONFIG_PCIPCWATCHDOG is not set

Write Preview
Loading…
Cancel
Save