summaryrefslogtreecommitdiff
path: root/adk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-03-05 12:51:42 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-03-07 06:42:57 +0100
commitc384dc577bd32f3315bacb410fc31610b41f742c (patch)
tree903aaed00f4b82d5e1eada2bd4fea8a7f3387ded /adk
parent68d4e79f35039b31ae835e82241a567b0ad66aa8 (diff)
rework menu based config system
After the addition of bare metal toolchains the menu system allowed to create non-valid configurations. I reworked it so we can also add other operating system support if we wish. So first you choose your operating system, then your architecture and endianess, after that your embedded system, emulator or generic device and then you choose your task you want to run. Tasks may be toolchain, a new appliance/application or some preconfigured sets of packages and configurations as kodi, mpd, firefox and more. The tasks are limited to a plausible choice of hardware and software. Deduplicate CPU configuration. You don't wanna compile Kodi for a H8/300 microcontroller ;)
Diffstat (limited to 'adk')
-rw-r--r--adk/config/symbol.c2
-rw-r--r--adk/tools/pkgrebuild.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/adk/config/symbol.c b/adk/config/symbol.c
index 27f8117d4..685a1ab14 100644
--- a/adk/config/symbol.c
+++ b/adk/config/symbol.c
@@ -393,6 +393,7 @@ void sym_calc_value(struct symbol *sym)
}
calc_newval:
if (sym->dir_dep.tri == no) {
+ /*
if (sym->rev_dep.tri != no) {
fprintf(stderr, "warning: (");
expr_fprint(sym->rev_dep.expr, stderr);
@@ -401,6 +402,7 @@ void sym_calc_value(struct symbol *sym)
expr_fprint(sym->dir_dep.expr, stderr);
fprintf(stderr, ")\n");
}
+ */
for (esv = sym->val_dep; esv; esv = esv->next) {
if ((esv->tri != no) &&
(expr_calc_value(esv->value) != no)) {
diff --git a/adk/tools/pkgrebuild.c b/adk/tools/pkgrebuild.c
index e7f037ae5..b4a63d89c 100644
--- a/adk/tools/pkgrebuild.c
+++ b/adk/tools/pkgrebuild.c
@@ -231,8 +231,10 @@ int main() {
closedir(pkgdir);
config = fopen(".config", "r");
- if (config == NULL)
+ if (config == NULL) {
perror(".config is missing.");
+ exit(1);
+ }
configmap = strmap_new(1024);
while (fgets(buf, 128, config) != NULL) {
@@ -245,8 +247,10 @@ int main() {
fclose(config);
configold = fopen(".config.old", "r");
- if (configold == NULL)
+ if (configold == NULL) {
perror(".config.old is missing.");
+ exit(1);
+ }
configoldmap = strmap_new(1024);
while (fgets(buf, 128, configold) != NULL) {