diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /adk | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'adk')
| -rw-r--r-- | adk/tools/pkgmaker.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index f5b1ec004..04237462e 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -785,10 +785,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } @@ -880,10 +877,7 @@ int main() { if (pkg_depends != NULL) { token = strtok(pkg_depends, " "); while (token != NULL) { - if (strncmp(token, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(token)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(token)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(token)); token = strtok(NULL, " "); } free(pkg_depends); @@ -996,10 +990,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } @@ -1055,10 +1046,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } @@ -1095,10 +1083,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } |