Showing the changes to scripts (6 of 4405 files). Show all
Unified · Split
| @@ -50,8 +50,12 @@ PHONY += __fw_install __fw_modinst FORCE · 49 unmodified lines | ||
| 50 | 50 | .PHONY: $(PHONY) |
| 51 | 51 | |
| 52 | 52 | __fw_install: $(installed-fw) |
| 53 | + | |
| 53 | 54 | __fw_modinst: $(installed-mod-fw) |
| 55 | + @: | |
| 56 | + | |
| 54 | 57 | __fw_modbuild: $(addprefix $(obj)/,$(mod-fw)) |
| 58 | + @: | |
| 55 | 59 | |
| 56 | 60 | FORCE: |
| 57 | 61 | |
| @@ -596,7 +596,7 @@ int main(int ac, char **av) · 595 unmodified lines | ||
| 596 | 596 | break; |
| 597 | 597 | } |
| 598 | 598 | |
| 599 | − if (conf_get_changed() && conf_write(NULL)) { | |
| 599 | + if (conf_write(NULL)) { | |
| 600 | 600 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); |
| 601 | 601 | exit(1); |
| 602 | 602 | } |
| @@ -222,10 +222,8 @@ load: · 221 unmodified lines | ||
| 222 | 222 | continue; |
| 223 | 223 | if (def == S_DEF_USER) { |
| 224 | 224 | sym = sym_find(line + 9); |
| 225 | − if (!sym) { | |
| 226 | − conf_warning("trying to assign nonexistent symbol %s", line + 9); | |
| 225 | + if (!sym) | |
| 227 | 226 | break; |
| 228 | − } | |
| 229 | 227 | } else { |
| 230 | 228 | sym = sym_lookup(line + 9, 0); |
| 231 | 229 | if (sym->type == S_UNKNOWN) |
| @@ -261,10 +259,8 @@ load: · 29 unmodified lines | ||
| 261 | 259 | } |
| 262 | 260 | if (def == S_DEF_USER) { |
| 263 | 261 | sym = sym_find(line + 7); |
| 264 | − if (!sym) { | |
| 265 | − conf_warning("trying to assign nonexistent symbol %s", line + 7); | |
| 262 | + if (!sym) | |
| 266 | 263 | break; |
| 267 | − } | |
| 268 | 264 | } else { |
| 269 | 265 | sym = sym_lookup(line + 7, 0); |
| 270 | 266 | if (sym->type == S_UNKNOWN) |
| @@ -1403,7 +1403,7 @@ sub dump_struct($$) { · 1402 unmodified lines | ||
| 1403 | 1403 | my $members = $3; |
| 1404 | 1404 | |
| 1405 | 1405 | # ignore embedded structs or unions |
| 1406 | − $members =~ s/{.*?}//g; | |
| 1406 | + $members =~ s/{.*}//g; | |
| 1407 | 1407 | |
| 1408 | 1408 | # ignore members marked private: |
| 1409 | 1409 | $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos; |
| @@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size, · 343 unmodified lines | ||
| 344 | 344 | struct module *mod) |
| 345 | 345 | { |
| 346 | 346 | const unsigned long id_size = sizeof(struct pnp_device_id); |
| 347 | − const struct pnp_device_id *id = symval; | |
| 347 | + const unsigned int count = (size / id_size)-1; | |
| 348 | + const struct pnp_device_id *devs = symval; | |
| 349 | + unsigned int i; | |
| 348 | 350 | |
| 349 | 351 | device_id_check(mod->name, "pnp", size, id_size, symval); |
| 350 | 352 | |
| 351 | − buf_printf(&mod->dev_table_buf, | |
| 352 | − "MODULE_ALIAS(\"pnp:d%s*\");\n", id->id); | |
| 353 | − buf_printf(&mod->dev_table_buf, | |
| 354 | − "MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id); | |
| 353 | + for (i = 0; i < count; i++) { | |
| 354 | + const char *id = (char *)devs[i].id; | |
| 355 | + | |
| 356 | + buf_printf(&mod->dev_table_buf, | |
| 357 | + "MODULE_ALIAS(\"pnp:d%s*\");\n", id); | |
| 358 | + buf_printf(&mod->dev_table_buf, | |
| 359 | + "MODULE_ALIAS(\"acpi*:%s:*\");\n", id); | |
| 360 | + } | |
| 355 | 361 | } |
| 356 | 362 | |
| 357 | 363 | /* looks like: "pnp:dD" for every device of the card */ |
| @@ -213,6 +213,7 @@ fi · 212 unmodified lines | ||
| 213 | 213 | if [ $stopvers != "default" ]; then |
| 214 | 214 | STOPSUBLEVEL=`echo $stopvers | cut -d. -f3` |
| 215 | 215 | STOPEXTRA=`echo $stopvers | cut -d. -f4` |
| 216 | + STOPFULLVERSION=${stopvers%%.$STOPEXTRA} | |
| 216 | 217 | #echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/" |
| 217 | 218 | else |
| 218 | 219 | STOPSUBLEVEL=9999 |
| @@ -249,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s) · 30 unmodified lines | ||
| 249 | 250 | do |
| 250 | 251 | CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL" |
| 251 | 252 | EXTRAVER= |
| 252 | − if [ $stopvers = $CURRENTFULLVERSION ]; then | |
| 253 | + if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then | |
| 253 | 254 | echo "Stopping at $CURRENTFULLVERSION base as requested." |
| 254 | 255 | break |
| 255 | 256 | fi |